🔧 fix config

.circleci/config.yml

@@ -1,41 +1,66 @@
-version: 2
+version: 2.1
+workflows:
+  version: 2
+  devopsTP4:
+    jobs:
+      - install
+      - back-deploy-heroku:
+          requires:
+            - install
+      - docker-build-and-push:
+          requires:
+            - install
+
 jobs:
   install:
     docker:
-      - image: circleci/python:3.9.1
-      - image: circleci/postgres:9.6.5
-        environment:
-          POSTGRES_DB: example
-          POSTGRES_USER: circleci
-          POSTGRES_PASSWORD: somePwd
-          POSTGRES_PORT: 5432
-          DATABASE_URL: postgresql://circleci:somePwd@localhost:5432/example
+      - image: cimg/python:3.9.1
+      - image: circleci/postgres:9.6.2
     working_directory: ~/repo
     steps:
       - checkout
+      - setup_remote_docker
       - restore_cache:
           keys:
             - dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
-            # Fallback to using the latest cache if no exact match is found
-            - dependencies-
-      - run: 
-          name: Install dependencies
-          command: pip install -r requirements/dev.txt
-      # Upgrade dependencies for sqlalchemy and Flask-SQLAlchemy to pass unit tests
       - run:
-          command: pip install sqlalchemy --upgrade && pip install Flask-SQLAlchemy --upgrade
-      - run: 
-          name: Setup dababase
+          name: install python and dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -r requirements/dev.txt
+      
+      - run: docker container run --name flask_db_test -e POSTGRES_PASSWORD=somePwd -e POSTGRES_USER=myUsr -p 5432:5432 -d postgres
+      - run: sleep 1
+      - run:
+          name: db migration
           environment:
             FLASK_APP: /home/circleci/repo/autoapp.py
-            FLASK_DEBUG: 0 
-          command: flask db upgrade
-      - run: 
-          name: Flask test
+            FLASK_DEBUG: 0
+            POSTGRES_USER: postgres
+            POSTGRES_DB: bdtest
+            POSTGRES_PASSWORD: somePwd
+            POSTGRES_PORT: 5432
+            DATABASE_URL: postgresql://postgres:somePwd@localhost:5432/postgres
+          command: |
+            . venv/bin/activate
+            flask db stamp head
+      - run:
+          name: db migration
           environment:
             FLASK_APP: /home/circleci/repo/autoapp.py
             FLASK_DEBUG: 0
-          command: flask test
+            POSTGRES_USER: postgres
+            POSTGRES_DB: bdtest
+            POSTGRES_PASSWORD: somePwd
+            POSTGRES_PORT: 5432
+            DATABASE_URL: postgresql://postgres:somePwd@localhost:5432/postgres
+          command: |
+            . venv/bin/activate
+            flask db migrate
+      - run: docker container stop flask_db_test
+      - run: docker container rm flask_db_test
+      - run: unset DATABASE_URL
   back-deploy-heroku:
     docker:
       - image: buildpack-deps:trusty
@@ -43,11 +68,11 @@ jobs:
       - checkout
       - run:
           name: Heroku Deploy
-          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:main -f
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:main
       - run:
           name: Smoke Test
           command: |
-            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/`
+            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://devops-final-heroku.herokuapp.com/api/articles`
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
               exit 1; \
@@ -69,15 +94,4 @@ jobs:
             docker tag app $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
             docker tag app $DOCKER_HUB_USER_ID/devops-back-final:latest
             docker push $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
-            docker push $DOCKER_HUB_USER_ID/devops-back-final:latest
-workflows:
-  version: 2
-  build-test:
-    jobs:
-      - install
-      - back-deploy-heroku:
-          requires:
-            - install
-      - docker-build-and-push:
-          requires:
-            - install
+            docker push $DOCKER_HUB_USER_ID/devops-back-final:latest