From 4807481456f7fa5db22a8e9675e7f4fa7dc73eab Mon Sep 17 00:00:00 2001 From: Tony Hsu Date: Mon, 22 Apr 2024 14:46:36 +0200 Subject: [PATCH] Fix build args for lib injection docker --- .github/workflows/lib-injection.yml | 4 +++- .github/workflows/release-lib-injection.yml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lib-injection.yml b/.github/workflows/lib-injection.yml index bf6ee6dd86..fd4133a834 100644 --- a/.github/workflows/lib-injection.yml +++ b/.github/workflows/lib-injection.yml @@ -22,7 +22,8 @@ jobs: push: true tags: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:latest_snapshot platforms: 'linux/amd64,linux/arm64/v8' - build-args: DDTRACE_RUBY_SHA=${{ github.sha }} + # The build arguments must match what is defined in lib-injection/Dockerfile + build-args: DATADOG_RUBY_GEM_SHA=${{ github.sha }} context: ./lib-injection - name: Docker Build uses: docker/build-push-action@v3 @@ -30,6 +31,7 @@ jobs: push: true tags: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:${{ github.sha }} platforms: 'linux/amd64,linux/arm64/v8' + # The build arguments must match what is defined in lib-injection/Dockerfile build-args: DATADOG_RUBY_GEM_SHA=${{ github.sha }} context: ./lib-injection test: diff --git a/.github/workflows/release-lib-injection.yml b/.github/workflows/release-lib-injection.yml index d06565bc31..46d7e29c2b 100644 --- a/.github/workflows/release-lib-injection.yml +++ b/.github/workflows/release-lib-injection.yml @@ -28,5 +28,6 @@ jobs: push: true tags: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:${{ steps.version.outputs.version }} platforms: 'linux/amd64,linux/arm64/v8' - build-args: DDTRACE_RUBY_VERSION=${{ steps.version.outputs.version }} + # The build arguments must match what is defined in lib-injection/Dockerfile + build-args: DATADOG_RUBY_GEM_VERSION=${{ steps.version.outputs.version }} context: ./lib-injection