From e0e4e7fb0d40cfb478db784c660d791f8cda2f84 Mon Sep 17 00:00:00 2001
From: "denisdalmeida04@gmail.com" <denisdalmeida04@gmail.com>
Date: Fri, 15 Jan 2021 23:37:51 +0100
Subject: [PATCH] :green_heart:update my circleci

---
 .circleci/config.yml | 61 +++++++++++++++++++++++---------------------
 Dockerfile           | 15 +++--------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea90048..697f5f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,29 +3,24 @@ workflows:
   build_circleci:
     jobs:
       - build
-      - initialise:
+      - test:
           requires:
             - build
-      - docker-build-and-push:
-          requires:
-            - initialise
-      - back-deploy-heroku:
-          requires:
-            - docker-build-and-push
 
 version: 2
 jobs:
   build:
     docker:
       - image: circleci/python:3.7.4
+    working_directory: ~/repo
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
-            - v2-dependencies-
+            - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
+            - v3-dependencies-
       - run:
-          name: install pyth dependencies
+          name: install dependencies
           command: |
             python3 -m venv venv
             . venv/bin/activate
@@ -37,51 +32,59 @@ jobs:
 
       - save_cache:
           paths:
-            - ./venv
-          key: v2-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
-  initialise:
+            - venv
+          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
+
+  test:
     docker:
       - image: circleci/python:3.7.4
-        environment:
-          DATABASE_URL: postgresql://myuser:somePwd@localhost:5432/mydb
       - image: postgres:9.6.2-alpine
         environment:
+          POSTGRES_USER: myUser  
+          POSTGRES_PASSOWRD: somePwd 
           POSTGRES_DB: mydb
-          POSTGRES_USER: myuser
-          POSTGRES_PASSWORD: somePwd
+
+    working_directory: ~/repo
+
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
-            - v2-dependencies-
+            - v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
+            - v3-dependencies-
       - run:
-          name: flask upgrade
+          name: bd upgrade 
           command: |
             . venv/bin/activate
             sleep 1
             flask db upgrade
           environment:
             CONDUIT_SECRET: 'something-really-secret'
-            FLASK_APP: ./autoapp.py
-            DATABASE_URL: postgresql://myuser:somePwd@localhost:5432/mydb
+            FLASK_APP: /home/circleci/repo/autoapp.py
+            DATABASE_URL: postgresql://myUser:somePwd@localhost:5432/myUser
             FLASK_DEBUG: 1
-            POSTGRES_USER: myuser
+            POSTGRES_USER: myUser
             POSTGRES_DB: mydb
             POSTGRES_PASSWORD: somePwd
             POSTGRES_PORT: 5432
+
       - run:
-          name: flask test
+          name: run tests
           command: |
             . venv/bin/activate
-            sleep 1
+            flask db migrate
             flask test
           environment:
             CONDUIT_SECRET: 'something-really-secret'
-            FLASK_APP: ./autoapp.py
-            DATABASE_URL: postgresql://myuser:somePwd@localhost:5432/mydb
+            FLASK_APP: /home/circleci/repo/autoapp.py
+            DATABASE_URL: postgresql://myUser:somePwd@localhost:5432/myUser
             FLASK_DEBUG: 1
-            POSTGRES_USER: myuser
+            POSTGRES_USER: myUser
             POSTGRES_DB: mydb
             POSTGRES_PASSWORD: somePwd
-            POSTGRES_PORT: 5432
\ No newline at end of file
+            POSTGRES_PORT: 5432
+
+      - save_cache:
+          paths:
+            - venv
+          key: v3-dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c8be564..34e2f35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,6 @@
-FROM python:3.6
-
-WORKDIR /app
+FROM node:dubnium
+WORKDIR /nest-server
 COPY . .
 
-ENV CONDUIT_SECRET='something-really-secret'
-ENV FLASK_APP=autoapp.py
-ENV FLASK_DEBUG=1
-
-RUN pip install -r requirements/dev.txt
-
-EXPOSE 8000
-CMD python autoapp.py
\ No newline at end of file
+RUN yarn install
+CMD ["yarn", "start"]
\ No newline at end of file