build(deps): bump ubi9/openjdk-21-runtime from 1.21-1.1738663155 to 1…

….21-1.1739376167 in /src/main/docker (#809) build(deps): bump ubi9/openjdk-21-runtime in /src/main/docker Bumps ubi9/openjdk-21-runtime from 1.21-1.1738663155 to 1.21-1.1739376167. --- updated-dependencies: - dependency-name: ubi9/openjdk-21-runtime dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f0e9e12) # Conflicts: # src/main/docker/Dockerfile.jvm
cryostatio · Feb 18, 2025 · 1cc8bc4 · 1cc8bc4
1 parent 08242d1
commit 1cc8bc4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
@@ -77,7 +77,11 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
+<<<<<<< HEAD
 FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21-1.1737580425
+=======
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21-1.1739376167
+>>>>>>> f0e9e12 (build(deps): bump ubi9/openjdk-21-runtime from 1.21-1.1738663155 to 1.21-1.1739376167 in /src/main/docker (#809))
 
 ENV LANGUAGE='en_US:en'