Skip to content

Update Docker build image #8754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github-actions wants to merge 1 commit into from
Closed

Update Docker build image #8754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/render_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
# Version to use for all the base Docker images, see
# https://github.com/DataDog/dd-trace-java-docker-build/pkgs/container/dd-trace-java-docker-build
DOCKER_IMAGE_VERSION="v25.01"
DOCKER_IMAGE_VERSION="v25.04"

# Get labels from pull requests to override some defaults for jobs to run.
# `run-tests: all` will run all tests.
Expand Down
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ default:
- echo "NORMALIZED_NODE_TOTAL=$NORMALIZED_NODE_TOTAL , NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX"

.gradle_build: &gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base
image: ghcr.io/datadog/dd-trace-java-docker-build:v25.04-base
Copy link
Contributor

@mcculls mcculls May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see JAVA_BUILD_IMAGE_VERSION in this file has been left as v25.01 - is there a reason the new version is inlined here instead of just updating JAVA_BUILD_IMAGE_VERSION ?

Copy link
Contributor

@PerfectSlayer PerfectSlayer May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GitLab configuration was changed from #8385 and #8448 but the automation was not.
@randomanderson can you make a fix to keep the automation running?

stage: build
variables:
GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx2560M -Xms2560M -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
Expand Down Expand Up @@ -130,7 +130,7 @@ spotless:

test_published_artifacts:
extends: .gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-7 # Needs Java7 for some tests
image: ghcr.io/datadog/dd-trace-java-docker-build:v25.04-base
Copy link
Contributor

@mcculls mcculls May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the image from v25.04-7 to v25.04-base - my understanding is that we still need a JDK 7 build to test the Java version check during bootstrap works as expected and doesn't allow the 1.x tracer to be used with Java 7

stage: tests
needs: [ build ]
variables:
Expand Down Expand Up @@ -250,7 +250,7 @@ muzzle-dep-report:

.test_job:
extends: .gradle_build
image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm
image: ghcr.io/datadog/dd-trace-java-docker-build:v25.04-base
needs: [ build ]
stage: tests
variables:
Expand Down