From fe243ebdffb97cc14a574426b06a96bda6ddca23 Mon Sep 17 00:00:00 2001
From: Alexandre BRACH <alexandre.brach@gmail.com>
Date: Fri, 22 Nov 2019 17:33:31 +0100
Subject: [PATCH] circleci #comment circleci refactor build

---
 .circleci/config.yml | 80 +++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ebc93224a..8284f38fa7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,6 +107,53 @@ jobs:
         - store_artifacts:
             path: /tmp/circleci-test-results
 
+
+    build_phraseanet-fpm:
+        machine:
+          image: ubuntu-1604:201903-01
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build --target phraseanet-fpm -t ${AWS_ACCOUNT_URL}/phraseanet-fpm:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-fpm"
+                tag: "${CIRCLE_BRANCH}"
+
+    build_phraseanet-worker:
+        machine:
+          image: ubuntu-1604:201903-01
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build --target phraseanet-worker -t ${AWS_ACCOUNT_URL}/phraseanet-worker:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-worker"
+                tag: "${CIRCLE_BRANCH}"
+
+    build_phraseanet-nginx:
+        machine:
+          image: ubuntu-1604:201903-01
+          docker_layer_caching: true
+        working_directory: ~/alchemy-fr/Phraseanet
+        steps:
+            - checkout
+            - aws-ecr/ecr-login:
+                region: AWS_DEFAULT_REGION
+            - run: docker build --target phraseanet-nginx -t ${AWS_ACCOUNT_URL}/phraseanet-nginx:${CIRCLE_BRANCH} .
+            - aws-ecr/push-image:
+                account-url: AWS_ACCOUNT_URL
+                repo: "phraseanet-nginx"
+                tag: "${CIRCLE_BRANCH}"
+
+
 workflows:
     version: 2
     oldfashion:
@@ -114,36 +161,9 @@ workflows:
             - build
     newfashion:
         jobs:
-            - aws-ecr/build_and_push_image:
-                account-url: AWS_ACCOUNT_URL
-                aws-access-key-id: AWS_ACCESS_KEY_ID
-                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+            - build_phraseanet-fpm:
                 context: "AWS London"
-                create-repo: true
-                dockerfile: Dockerfile
-                extra-build-args: "--target phraseanet-fpm"
-                region: AWS_DEFAULT_REGION
-                repo: "phraseanet-fpm"
-                tag: "${CIRCLE_BRANCH}"
-            - aws-ecr/build_and_push_image:
-                account-url: AWS_ACCOUNT_URL
-                aws-access-key-id: AWS_ACCESS_KEY_ID
-                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+            - build_phraseanet-worker:
                 context: "AWS London"
-                create-repo: true
-                dockerfile: Dockerfile
-                extra-build-args: "--target phraseanet-nginx"
-                region: AWS_DEFAULT_REGION
-                repo: "phraseanet-nginx"
-                tag: "${CIRCLE_BRANCH}"
-            - aws-ecr/build_and_push_image:
-                account-url: AWS_ACCOUNT_URL
-                aws-access-key-id: AWS_ACCESS_KEY_ID
-                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+            - build_phraseanet-nginx:
                 context: "AWS London"
-                create-repo: true
-                dockerfile: Dockerfile
-                extra-build-args: "--target phraseanet-worker"
-                region: AWS_DEFAULT_REGION
-                repo: "phraseanet-worker"
-                tag: "${CIRCLE_BRANCH}"