Merge pull request #197 from bosonprotocol/container-build

Fix ECR login
bosonprotocol · Jan 5, 2022 · fd5e138 · fd5e138
2 parents 914c462 + 5d0da26
commit fd5e138
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -46,10 +46,14 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-2
-      - name: Login to Amazon ECR
+      - id: install-aws-cli
         if: ${{ github.event_name == 'push' }}
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+      - name: ECR login
+        if: ${{ github.event_name == 'push' }}
+        run: aws ecr get-login-password | docker login --username AWS --password-stdin $REGISTRY
       - name: Export TAG value
         if: ${{ github.event_name == 'push' }}
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
@@ -81,10 +85,14 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-2
-      - name: Login to Amazon ECR
+      - id: install-aws-cli
+        if: ${{ github.event_name == 'push' }}
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2
+      - name: ECR login
         if: ${{ github.event_name == 'push' }}
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        run: aws ecr get-login-password | docker login --username AWS --password-stdin $REGISTRY
       - name: Export TAG value
         if: ${{ github.event_name == 'push' }}
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
     && apt-get -y install python3 curl unzip \
     && cd /tmp \
     && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
-    && unzip awscliv2.zip \
+    && unzip -q awscliv2.zip \
     && ./aws/install \
     && rm awscliv2.zip \
     && rm -rf aws

diff --git a/external/keepers/Dockerfile b/external/keepers/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
     && apt-get -y install python3 curl unzip \
     && cd /tmp \
     && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
-    && unzip awscliv2.zip \
+    && unzip -q awscliv2.zip \
     && ./aws/install \
     && rm awscliv2.zip \
     && rm -rf aws