Skip to content

Use versioned docker images in CI #5963

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

Merged
smola merged 3 commits into from
Oct 4, 2023
Merged

Use versioned docker images in CI #5963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35cd3a9
Use versioned docker images in CI
smola Sep 29, 2023
0dd042e
Update .circleci/render_config.py
smola Sep 29, 2023
851d375
Merge branch 'master' into smola/versioned-docker-ci-images
smola Oct 3, 2023
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
4 changes: 2 additions & 2 deletions .circleci/config.continue.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ parameters:

docker_image_tag:
type: string
default: base
default: {{ docker_image_prefix }}base

commands:
check_for_leftover_files:
Expand Down Expand Up @@ -483,7 +483,7 @@ jobs:
resource_class: large

docker:
- image: << pipeline.parameters.docker_image >>:<< parameters.testJvm >>
- image: << pipeline.parameters.docker_image >>:{{ docker_image_prefix }}<< parameters.testJvm >>

parameters:
testJvm:
Expand Down
4 changes: 4 additions & 0 deletions .circleci/render_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"semeru17",
"ubuntu17",
}
# 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="v23.09"

# Get labels from pull requests to override some defaults for jobs to run.
# `run-tests: all` will run all tests.
Expand Down Expand Up @@ -88,6 +91,7 @@
"all_debugger_jdks": all_debugger_jdks,
"nocov_jdks": nocov_jdks,
"flaky": branch == "master" or "flaky" in labels or "all" in labels,
"docker_image_prefix": "" if is_nightly else f"{DOCKER_IMAGE_VERSION}-",
}

print(f"Variables for this build: {vars}")
Expand Down