From e425e90eebcb4da3886f52499f7e27d09f5731c8 Mon Sep 17 00:00:00 2001
From: Victor Radael <victor.radael@datasprints.com>
Date: Tue, 12 Apr 2022 17:59:41 -0300
Subject: [PATCH] FIX: CI

---
 .github/workflows/deploy.yml | 4 ++++
 .github/workflows/test.yml   | 2 ++
 build.docker-compose.yml     | 2 +-
 docker-compose.yml           | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fd4b5d6..beeda74 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -86,6 +86,7 @@ jobs:
       - name: Configure AWS Region
         if: steps.semantic.outputs.new_release_published == 'true'
         uses: aws-actions/configure-aws-credentials@v1
+        id: aws
         with:
           aws-region: us-east-1
 
@@ -112,6 +113,7 @@ jobs:
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
           IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
@@ -122,9 +124,11 @@ jobs:
         env:
           ENV: ${{ steps.extract_environment.outputs.result }}
           IMAGE_TAG: ${{ steps.semantic.outputs.new_release_version }}
+          ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
         run: |
           sed -i -e "s/\${ENV}/$ENV/g" docker-compose.yml
           sed -i -e "s/\${IMAGE_TAG}/$IMAGE_TAG/g" docker-compose.yml
+          sed -i -e "s/\${ACCOUNT_ID}/$ACCOUNT_ID/g" docker-compose.yml
           zip deploy.zip docker-compose.yml  -r .ebextensions
 
       - name: Deploy AWS Beanstalk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 577e189..4d89bc6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,12 +25,14 @@ jobs:
         run: |
           export ENV=test
           export IMAGE_TAG=test
+          export ACCOUNT_ID=test
           docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN}
 
       - name: Run Test
         env:
           ENV: test
           IMAGE_TAG: test
+          ACCOUNT_ID: test
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           export ENV=test
diff --git a/build.docker-compose.yml b/build.docker-compose.yml
index 0cf1027..62b9307 100644
--- a/build.docker-compose.yml
+++ b/build.docker-compose.yml
@@ -2,4 +2,4 @@ version: "3.8"
 services:
   maestro:
     build: .
-    image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
+    image: ${ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
diff --git a/docker-compose.yml b/docker-compose.yml
index fb0aad4..72b6c3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   maestro:
-    image: 468720548566.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
+    image: ${ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/microservices/maestro_${ENV}:${IMAGE_TAG}
     container_name: maestro
     restart: always
     ports: