From 88ccf5209519371cfeba67f3bce3d0f9dfa1562d Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Thu, 2 Dec 2021 00:21:50 +0000 Subject: [PATCH 1/2] odpi/egeria#5929 correct docker container tag to 3.4 Signed-off-by: Nigel Jones --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 2c84271..c822a52 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: "Merge" env: - RELEASE_VERSION: 2.11-SNAPSHOT + RELEASE_VERSION: 3.4 steps: - uses: actions/checkout@v2 - name: Set up JDK From 3dfea2795c344cf055d9b6fa46e5bbd3d9cc5720 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Thu, 2 Dec 2021 00:25:49 +0000 Subject: [PATCH 2/2] #130 add arm64 architecture Signed-off-by: Nigel Jones --- .github/workflows/merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index c822a52..baaf239 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -76,6 +76,7 @@ jobs: build-args: version=${{ env.RELEASE_VERSION }} context: . file: ./Dockerfile + platforms: linux/amd64,linux/arm64 # For main code stream - name: Build and push (main merge) if: github.ref == 'refs/heads/main' @@ -87,6 +88,7 @@ jobs: build-args: version=${{ env.RELEASE_VERSION }} context: . file: ./Dockerfile + platforms: linux/amd64,linux/arm64 - name: Image digest (release) if: github.ref != 'refs/heads/main' run: echo ${{ steps.docker_build_release.outputs.digest }}