From 78bb600c3d2fc491c1347e65e694d967583ce87c Mon Sep 17 00:00:00 2001
From: LecomteAdrien <lecomteadrien@hotmail.fr>
Date: Thu, 5 Nov 2020 13:45:24 +0100
Subject: [PATCH] db

---
 .circleci/config.yml | 82 ++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 61 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bfdc73..ff940f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,30 +6,13 @@ workflows:
       - lint:
           requires:
             - build
-      - test:
+      - tests:
           requires:
             - build
-      - e2e:
+      - db:
           requires:
             - build
-      - build_docker:
-          requires:
-            - e2e
-            - lint
-            - test
-          filters:
-            branches:
-                only:
-                    - main
-      - publish_image:
-          context: 
-            - DOCKER
-          requires:
-            - build_docker
-          filters:
-            branches:
-                only:
-                    - main
+     
 jobs:
     build:
         docker:
@@ -43,34 +26,43 @@ jobs:
                 key: yarn-packages-v3{{ checksum "yarn.lock" }}
                 paths:
                     - ./node_modules
-    lint:
+    tests:
         docker:
             - image: cimg/node:12.18
         steps:
             - checkout
             - restore_cache:
                 key: yarn-packages-v3{{ checksum "yarn.lock" }}
-            - run : yarn lint && yarn format:check
-    test:
+            - run : yarn test:ci
+            - save_cache:
+                key: yarn-packages-v3{{ checksum "yarn.lock" }}
+                paths:
+                    - ./node_modules
+    lint:
         docker:
             - image: cimg/node:12.18
         steps:
             - checkout
             - restore_cache:
                 key: yarn-packages-v3{{ checksum "yarn.lock" }}
-            - run : yarn test:ci
-    e2e:
+            - run : yarn lint && yarn format:check
+            - save_cache:
+                key: yarn-packages-v3{{ checksum "yarn.lock" }}
+                paths:
+                    - ./node_modules
+            
+    db:
         docker:
             - image: cimg/node:12.18
               environment: 
-                DATABASE_URL: "postgres://e2e:test@localhost:5432/psdb"
+                DATABASE_URL: "postgres://psqluer:test@localhost:5432/psdb"
                 API_PORT: 3000
                 API_HOST: localhost
                 API_PROTOCOL: http
-                JWT_SECRET: yeet
+                JWT_SECRET: some string yo want
             - image: circleci/postgres:9.6.2-alpine
               environment:
-                POSTGRES_USER: e2e
+                POSTGRES_USER: psqluer
                 POSTGRES_DB: psdb   
                 POSTGRES_PASSWORD: test
         
@@ -83,36 +75,4 @@ jobs:
                 command: dockerize -wait tcp://localhost:5432 -timeout 1m
             - run: 
                 name: Launching e2e test
-                command: yarn test:e2e
-    build_docker:
-        environment:
-            IMAGE_NAME: sgttabouret/my-awesome-ci-expr
-        docker:
-            - image: circleci/buildpack-deps:stretch
-        steps: 
-            - checkout
-            - setup_remote_docker
-            - run: docker image build --tag $IMAGE_NAME:app .
-            - run: docker save -o image.tar $IMAGE_NAME
-            - persist_to_workspace:
-                root: .
-                paths:
-                    - ./image.tar         
-    publish_image:
-        environment:
-            IMAGE_NAME: sgttabouret/my-awesome-ci-expr
-        docker:
-            - image: circleci/buildpack-deps:stretch
-        steps:
-            - attach_workspace:
-                at: /tmp/workspace
-            - setup_remote_docker
-            - run: docker load -i /tmp/workspace/image.tar
-            - run: 
-                name: Login and Publish to Docker Hub
-                command: |
-                    echo "$DOCKERHUB_PASS" | docker login --username sgttabouret --password-stdin 
-                    docker tag $IMAGE_NAME:app $IMAGE_NAME:$CIRCLE_BUILD_NUM
-                    docker tag $IMAGE_NAME:app $IMAGE_NAME:latest
-                    docker push $IMAGE_NAME:latest
-                    docker push $IMAGE_NAME:$CIRCLE_BUILD_NUM
\ No newline at end of file
+                command: yarn test:e2e
\ No newline at end of file