From 77af0c2cde13b6a93891336e8facf3a4ef338e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:28:17 -0400 Subject: [PATCH 1/2] build(deps): bump ubi8/openjdk-17-runtime in /src/container (#1943) Bumps ubi8/openjdk-17-runtime from 1.19-4.1715070687 to 1.20-2. --- updated-dependencies: - dependency-name: ubi8/openjdk-17-runtime dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 103901b89f57847cc9903fc62ada6883aa72520b) # Conflicts: # src/container/Dockerfile --- src/container/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/container/Dockerfile b/src/container/Dockerfile index 83e155e306..aea9d91369 100644 --- a/src/container/Dockerfile +++ b/src/container/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18-2 +======= +FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-2 +>>>>>>> 103901b8 (build(deps): bump ubi8/openjdk-17-runtime in /src/container (#1943)) USER root From 821a797cf1402028cbbf371d58466ae1e9eace1d Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Mon, 10 Jun 2024 11:31:50 -0400 Subject: [PATCH 2/2] fixup! build(deps): bump ubi8/openjdk-17-runtime in /src/container (#1943) --- src/container/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/container/Dockerfile b/src/container/Dockerfile index aea9d91369..2f4e5e16ce 100644 --- a/src/container/Dockerfile +++ b/src/container/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18-2 -======= FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-2 ->>>>>>> 103901b8 (build(deps): bump ubi8/openjdk-17-runtime in /src/container (#1943)) USER root