Update IronBank docker image base to ubi:9.2 (#101393) (#101402)

mark-vieira · web-flow · commit 0aa8cda01f50 · 2023-10-26T15:48:59.000-04:00
# Conflicts:
#	distribution/docker/src/docker/Dockerfile
#	distribution/docker/src/docker/iron_bank/hardening_manifest.yaml
diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
@@ -311,7 +311,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {
       if (base == DockerBase.IRON_BANK) {
         Map<String, String> buildArgsMap = [
           'BASE_REGISTRY': 'docker.elastic.co',
-          'BASE_IMAGE'   : 'ubi8/ubi',
+          'BASE_IMAGE'   : 'ubi9/ubi',
           'BASE_TAG'     : 'latest'
         ]
 
diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile
@@ -26,8 +26,8 @@
 ################################################################################
 
 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.5
+ARG BASE_IMAGE=redhat/ubi/ubi9
+ARG BASE_TAG=9.2
 
 FROM ${base_image} AS builder
 
diff --git a/distribution/docker/src/docker/iron_bank/hardening_manifest.yaml b/distribution/docker/src/docker/iron_bank/hardening_manifest.yaml
@@ -13,8 +13,8 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.5"
+  BASE_IMAGE: "redhat/ubi/ubi9"
+  BASE_TAG: "9.2"
 
 # Docker image labels
 labels:

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {`
`311`	`311`	`if (base == DockerBase.IRON_BANK) {`
`312`	`312`	`Map<String, String> buildArgsMap = [`
`313`	`313`	`'BASE_REGISTRY': 'docker.elastic.co',`
`314`		`- 'BASE_IMAGE' : 'ubi8/ubi',`
	`314`	`+ 'BASE_IMAGE' : 'ubi9/ubi',`
`315`	`315`	`'BASE_TAG' : 'latest'`
`316`	`316`	`]`
`317`	`317`