diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5167773..dc03f37 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,11 +8,6 @@ jobs:
           FLASK_APP: autoapp.py
           CONDUIT_SECRET: 'something-really-secret'
           FLASK_DEBUG: 1
-      - image: circleci/postgres:9.6.5-alpine-ram
-        environment:
-          POSTGRES_USER: myUsr
-          POSTGRES_DB: psdb
-          POSTGRES_PASSWORD: somePwd
     steps:
       - checkout
       - restore_cache:
@@ -70,7 +65,25 @@ jobs:
               echo "heroku app not responding, failing deploy"
               exit 1
             fi
-
+  docker-build-push:
+    working_directory: /dockerapp
+    docker:
+      - image: docker:17.05.0-ce-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name:  dockerize the app 
+          command: |
+            docker build --cache-from=app -t app .
+      - run: 
+          name: Publish app to docker hub
+          command: |
+            docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
+            docker tag app $DOCKER_HUB_USERNAME/tp-devops-front:$CIRCLE_BUILD_NUM
+            docker tag app $DOCKER_HUB_USERNAME/tp-devops-front:latest
+            docker push $DOCKER_HUB_USERNAME/tp-devops-front:$CIRCLE_BUILD_NUM
+            docker push $DOCKER_HUB_USERNAME/tp-devops-front:latest
 workflows:
   build_test_deploy:
     jobs:
@@ -78,4 +91,7 @@ workflows:
       - deploy-heroku:
           context: Heroku
           requires: 
-            - build
\ No newline at end of file
+            - build
+      - docker-build-push:
+          requires: 
+            - build
diff --git a/Dockerfile b/Dockerfile
index 0e8d43b..e3e57a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,5 +9,4 @@ RUN pip install -r requirements/dev.txt
 
 EXPOSE 8000
 
-
 CMD python autoapp.py
\ No newline at end of file