Skip to content

Commit f48216d

Browse files
authored
Use the latest docker build image to fix the Oracle Java 8 issue (was using JRE instead of JDK) (#8932)
* build(ci): Use latest build image * build(ci): Keeps ending comments when updating builder image
1 parent c08d6d9 commit f48216d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/update-docker-build-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
echo "::notice::Using Docker build image tag: ${TAG}"
5353
- name: Update the Docker build image in GitLab CI config
5454
run: |
55-
sed -i 's|BUILDER_IMAGE_VERSION_PREFIX:.*|BUILDER_IMAGE_VERSION_PREFIX:"${{ steps.define-tag.outputs.tag }}-"|' .gitlab-ci.yml
55+
sed -i '' -E 's|(BUILDER_IMAGE_VERSION_PREFIX:)[^#]*([#].*)|\1 "${{ steps.define-tag.outputs.tag }}-" \2|' .gitlab-ci.yml
5656
- name: Commit and push changes
5757
env:
5858
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variables:
2727
GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
2828
MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
2929
GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
30-
BUILDER_IMAGE_VERSION_PREFIX: "v25.05-"
30+
BUILDER_IMAGE_VERSION_PREFIX: "" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3131
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3232
DEFAULT_TEST_JVMS: /^(8|11|17|21)$/
3333
PROFILE_TESTS:

0 commit comments

Comments
 (0)