From 5afdc43bd6a60ee7aee9671eb7b64be8e79dd7e6 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 10 Jul 2024 13:24:09 +0200 Subject: [PATCH] feat: make published Docker images multi-platform, add linux/arm64 plat --- .github/workflows/release-step-3.yml | 12 ++++++++---- .github/workflows/snapshot.yml | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index cc62afb8..e3133aa0 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -80,7 +80,7 @@ jobs: steps: - id: buildkite-run name: Run Release - uses: elastic/oblt-actions/buildkite/run@v1.5.0 + uses: elastic/oblt-actions/buildkite/run@v1 with: pipeline: "elastic-otel-java-release" token: ${{ secrets.BUILDKITE_TOKEN }} @@ -90,7 +90,7 @@ jobs: dry_run=${{ inputs.dry_run || 'false' }} TARBALL_FILE=${{ env.TARBALL_FILE }} - - uses: elastic/oblt-actions/buildkite/download-artifact@v1.5.0 + - uses: elastic/oblt-actions/buildkite/download-artifact@v1 with: build-number: ${{ steps.buildkite-run.outputs.number }} path: ${{ env.TARBALL_FILE }} @@ -106,7 +106,7 @@ jobs: subject-path: "${{ github.workspace }}/**/*.jar" - if: ${{ success() && ! inputs.dry_run }} - uses: elastic/oblt-actions/slack/send@v1.5.0 + uses: elastic/oblt-actions/slack/send@v1 with: bot-token: ${{ secrets.SLACK_BOT_TOKEN }} channel-id: "#apm-agent-java" @@ -114,7 +114,7 @@ jobs: :runner: [${{ github.repository }}] Release *${{ github.ref_name }}* has been triggered in Buildkite: (<${{ steps.buildkite-run.outputs.build }}|build>) - if: ${{ failure() && ! inputs.dry_run }} - uses: elastic/oblt-actions/slack/send@v1.5.0 + uses: elastic/oblt-actions/slack/send@v with: bot-token: ${{ secrets.SLACK_BOT_TOKEN }} channel-id: "#apm-agent-java" @@ -143,6 +143,9 @@ jobs: - name: Get latest tag run: echo "LATEST_TAG=$(git tag --list --sort=version:refname "v*" | grep -v RC | sed s/^v// | tail -n 1)" >> "${GITHUB_ENV}" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + - name: Log in to the Elastic Container registry uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0 with: @@ -170,6 +173,7 @@ jobs: with: context: . file: "docker/Dockerfile" + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.docker-meta.outputs.tags }} labels: ${{ steps.docker-meta.outputs.labels }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 051f939e..d88c22f6 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -53,7 +53,7 @@ jobs: - id: buildkite-run name: Run Deploy - uses: elastic/oblt-actions/buildkite/run@v1.5.0 + uses: elastic/oblt-actions/buildkite/run@v1 with: commit: ${{ github.ref_name }} pipeline: "elastic-otel-java-snapshot" @@ -63,7 +63,7 @@ jobs: dry_run=${{ inputs.dry_run || 'false' }} TARBALL_FILE=${{ env.TARBALL_FILE }} - - uses: elastic/oblt-actions/buildkite/download-artifact@v1.5.0 + - uses: elastic/oblt-actions/buildkite/download-artifact@v1 with: build-number: ${{ steps.buildkite-run.outputs.number }} path: ${{ env.TARBALL_FILE }} @@ -79,7 +79,7 @@ jobs: subject-path: "${{ github.workspace }}/**/*.jar" - if: ${{ failure() }} - uses: elastic/oblt-actions/slack/send@v1.5.0 + uses: elastic/oblt-actions/slack/send@v1 with: bot-token: ${{ secrets.SLACK_BOT_TOKEN }} channel-id: "#apm-agent-java"