From e8e7f24ed03b241e7caeeef7b6a22d491c0598b5 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 13 May 2025 13:10:55 -0400 Subject: [PATCH 1/2] Fix java build image update automation --- .github/workflows/update-docker-build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-docker-build-image.yaml b/.github/workflows/update-docker-build-image.yaml index 8de7b4a90d1..b07f1395721 100644 --- a/.github/workflows/update-docker-build-image.yaml +++ b/.github/workflows/update-docker-build-image.yaml @@ -55,7 +55,7 @@ jobs: sed -i 's|DOCKER_IMAGE_VERSION=.*|DOCKER_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .circleci/render_config.py - name: Update the Docker build image in GitLab CI config run: | - sed -i 's|image: ghcr.io/datadog/dd-trace-java-docker-build:.*|image: ghcr.io/datadog/dd-trace-java-docker-build:${{ steps.define-tag.outputs.tag }}-base|' .gitlab-ci.yml + sed -i 's|JAVA_BUILD_IMAGE_VERSION=.*|JAVA_BUILD_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .gitlab-ci.yml - name: Commit and push changes env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 1442addebf88cba37247169407cdceb6bc656718 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 13 May 2025 13:32:19 -0400 Subject: [PATCH 2/2] : not = --- .github/workflows/update-docker-build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-docker-build-image.yaml b/.github/workflows/update-docker-build-image.yaml index b07f1395721..69dbfd90725 100644 --- a/.github/workflows/update-docker-build-image.yaml +++ b/.github/workflows/update-docker-build-image.yaml @@ -55,7 +55,7 @@ jobs: sed -i 's|DOCKER_IMAGE_VERSION=.*|DOCKER_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .circleci/render_config.py - name: Update the Docker build image in GitLab CI config run: | - sed -i 's|JAVA_BUILD_IMAGE_VERSION=.*|JAVA_BUILD_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .gitlab-ci.yml + sed -i 's|JAVA_BUILD_IMAGE_VERSION:.*|JAVA_BUILD_IMAGE_VERSION:"${{ steps.define-tag.outputs.tag }}"|' .gitlab-ci.yml - name: Commit and push changes env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}