From 1c83dc5b866b4e84417c79b9d446fb25f0184f70 Mon Sep 17 00:00:00 2001 From: Devin Ford Date: Tue, 11 Apr 2023 10:08:05 -0400 Subject: [PATCH 1/2] feat: update workflow, revert docker file --- .github/workflows/frontend.yml | 15 ++++++++++++--- services/frontend/Dockerfile | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 27392578..52d809e1 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -40,11 +40,20 @@ jobs: username: ${{ secrets.AWS_ACCESS_KEY_ID }} password: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - - name: Build and push + - name: Build and push AMD uses: docker/build-push-action@v2 with: context: ./services/frontend - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true - tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:latest + tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend-amd:latest + + - name: Build and push ARM + uses: docker/build-push-action@v2 + continue-on-error: true + with: + context: ./services/frontend + platforms: linux/arm64 + push: true + tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend-arm:latest diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile index 6bcf3365..eca48707 100644 --- a/services/frontend/Dockerfile +++ b/services/frontend/Dockerfile @@ -2,4 +2,4 @@ FROM node:16.18.0 as builder WORKDIR /storedog-app COPY . . EXPOSE 3000 -RUN ["yarn","install", "--network-timeout 1000000"] \ No newline at end of file +RUN ["yarn","install"] \ No newline at end of file From 346e55445e233d936807e53789c44323697ce43b Mon Sep 17 00:00:00 2001 From: Devin Ford Date: Tue, 11 Apr 2023 10:32:36 -0400 Subject: [PATCH 2/2] fix: tagging convention --- .github/workflows/frontend.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 52d809e1..02cb13b6 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -46,7 +46,7 @@ jobs: context: ./services/frontend platforms: linux/amd64 push: true - tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend-amd:latest + tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:amd-latest - name: Build and push ARM uses: docker/build-push-action@v2 @@ -55,5 +55,5 @@ jobs: context: ./services/frontend platforms: linux/arm64 push: true - tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend-arm:latest + tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:arm-latest