From 11700e2598e50d142fc6a9c5171a53729d10bd5c Mon Sep 17 00:00:00 2001 From: Joseph DeBono Date: Tue, 14 Mar 2023 15:03:42 +0100 Subject: [PATCH 1/3] Update java-build-and-publish-ms.yml --- .github/workflows/java-build-and-publish-ms.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-build-and-publish-ms.yml b/.github/workflows/java-build-and-publish-ms.yml index 5a5f2ce9..8e1d0055 100644 --- a/.github/workflows/java-build-and-publish-ms.yml +++ b/.github/workflows/java-build-and-publish-ms.yml @@ -131,15 +131,16 @@ jobs: run: | REPO=$(git config --get remote.origin.url) DATE=$(date --utc +%FT%TZ) - docker build \ + docker buildx create --use + docker buildx build \ --build-arg JAR_FILE=$EXEC_PROJECT/target/*-exec.jar \ --build-arg GIT_HASH=${{ github.sha }} \ --build-arg DATE="$DATE" \ --build-arg GIT_REPO=$REPO \ --build-arg GIT_REF=${{ github.ref }} \ --build-arg VERSION=${{ env.VERSION }} \ - -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . - docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG + --platform linux/amd64,linux/arm64 \ + --push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . - name: Logout of Amazon ECR if: always() run: docker logout ${{ steps.login-ecr.outputs.registry }} From 4d6a6432b8ec405e9a5c0bd09cb298be2c385467 Mon Sep 17 00:00:00 2001 From: Joseph DeBono Date: Tue, 14 Mar 2023 15:41:10 +0100 Subject: [PATCH 2/3] Update java-build-and-publish-ms.yml --- .github/workflows/java-build-and-publish-ms.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-build-and-publish-ms.yml b/.github/workflows/java-build-and-publish-ms.yml index 8e1d0055..7e32ec03 100644 --- a/.github/workflows/java-build-and-publish-ms.yml +++ b/.github/workflows/java-build-and-publish-ms.yml @@ -140,7 +140,8 @@ jobs: --build-arg GIT_REF=${{ github.ref }} \ --build-arg VERSION=${{ env.VERSION }} \ --platform linux/amd64,linux/arm64 \ - --push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + --push + -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . - name: Logout of Amazon ECR if: always() run: docker logout ${{ steps.login-ecr.outputs.registry }} From e3ba8100e02d0151b9edc2530f225382700ef33f Mon Sep 17 00:00:00 2001 From: Joseph DeBono Date: Tue, 14 Mar 2023 16:09:37 +0100 Subject: [PATCH 3/3] Update java-build-and-publish-ms.yml --- .github/workflows/java-build-and-publish-ms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-build-and-publish-ms.yml b/.github/workflows/java-build-and-publish-ms.yml index 7e32ec03..cb890130 100644 --- a/.github/workflows/java-build-and-publish-ms.yml +++ b/.github/workflows/java-build-and-publish-ms.yml @@ -140,7 +140,7 @@ jobs: --build-arg GIT_REF=${{ github.ref }} \ --build-arg VERSION=${{ env.VERSION }} \ --platform linux/amd64,linux/arm64 \ - --push + --push \ -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . - name: Logout of Amazon ECR if: always()