From 35cd3a966fa5fc8a94c59ade68621ae620713934 Mon Sep 17 00:00:00 2001
From: Santiago Mola <santiago.mola@datadoghq.com>
Date: Fri, 29 Sep 2023 12:48:52 +0200
Subject: [PATCH 1/2] Use versioned docker images in CI

Nightly builds use latest versions, everything else use a pinned
version.
---
 .circleci/config.continue.yml.j2 | 4 ++--
 .circleci/render_config.py       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
index ca5d6a71133..b135fc6874f 100644
--- a/.circleci/config.continue.yml.j2
+++ b/.circleci/config.continue.yml.j2
@@ -62,7 +62,7 @@ parameters:
 
   docker_image_tag:
     type: string
-    default: base
+    default: {{ docker_image_prefix }}base
 
 commands:
   check_for_leftover_files:
@@ -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:
diff --git a/.circleci/render_config.py b/.circleci/render_config.py
index a796ce9b060..7776e21e801 100755
--- a/.circleci/render_config.py
+++ b/.circleci/render_config.py
@@ -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="v1"
 
 # Get labels from pull requests to override some defaults for jobs to run.
 # `run-tests: all` will run all tests.
@@ -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}")

From 0dd042e0210e9fbe66b9fe21829c86cab72a42bd Mon Sep 17 00:00:00 2001
From: "Santiago M. Mola" <santiago.mola@datadoghq.com>
Date: Fri, 29 Sep 2023 15:43:19 +0200
Subject: [PATCH 2/2] Update .circleci/render_config.py

---
 .circleci/render_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/render_config.py b/.circleci/render_config.py
index 7776e21e801..51cd43d413d 100755
--- a/.circleci/render_config.py
+++ b/.circleci/render_config.py
@@ -28,7 +28,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="v1"
+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.