ironbank: move to ubi9 (#37017)

* ironbank: move to ubi9 * packaging: ubi-minimal 9 requires -y to bypass the prompt --------- Co-authored-by: Pierre HILBERT <[email protected]> (cherry picked from commit d4630af) # Conflicts: # .ci/packaging.groovy # Jenkinsfile # dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
elastic · Nov 6, 2023 · 35c3b04 · 35c3b04
1 parent ccd93f2
commit 35c3b04
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 18 deletions.
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -331,10 +331,14 @@ def linuxPlatforms() {
 def pushCIDockerImages(Map args = [:]) {
   def arch = args.get('arch', 'amd64')
   catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
+<<<<<<< HEAD
     def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi8' : 'beats' ]
     def completeVariant = ['-complete' : 'beats']
     // Cloud is not public available, therefore it should use the beats-ci namespace.
     def cloudVariant = ['-cloud' : 'beats-ci']
+=======
+    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
+>>>>>>> d4630af1cf (ironbank: move to ubi9 (#37017))
     if (env?.BEATS_FOLDER?.endsWith('auditbeat')) {
       tagAndPush(beatName: 'auditbeat', arch: arch, variants: defaultVariants)
     } else if (env?.BEATS_FOLDER?.endsWith('filebeat')) {

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -461,8 +461,12 @@ def pushCIDockerImages(Map args = [:]) {
   def arch = args.get('arch', 'amd64')
   def beatsFolder = args.beatsFolder
   catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
+<<<<<<< HEAD
     def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi8' : 'beats' ]
     def completeVariant = ['-complete' : 'beats']
+=======
+    def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
+>>>>>>> d4630af1cf (ironbank: move to ubi9 (#37017))
     if (beatsFolder.endsWith('auditbeat')) {
       tagAndPush(beatName: 'auditbeat', arch: arch, variants: defaultVariants)
     } else if (beatsFolder.endsWith('filebeat')) {

diff --git a/dev-tools/dependencies-report b/dev-tools/dependencies-report
@@ -46,9 +46,9 @@ go list -m -json all $@ | go run go.elastic.co/go-licence-detector \
 # Fill-in required values for UBI images
 # Check headers in $SRCPATH/notice/dependencies.csv.tmpl:
 # name,url,version,revision,license
-ubi8url='https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8'
-ubi8source='https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz'
+ubiurl='https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5'
+ubisource='https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz'
 ubilicense='Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf'
 cat <<EOF >> $outfile
-Red Hat Universal Base Image minimal,$ubi8url,8,,$ubilicense,$ubi8source
+Red Hat Universal Base Image minimal,$ubiurl,9,,$ubilicense,$ubisource
 EOF
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -667,13 +667,13 @@ shared:
 
   - &docker_ubi_spec
     extra_vars:
-      image_name: '{{.BeatName}}-ubi8'
-      from: 'docker.elastic.co/ubi8/ubi-minimal'
+      image_name: '{{.BeatName}}-ubi9'
+      from: 'docker.elastic.co/ubi9/ubi-minimal'
 
   - &docker_arm_ubi_spec
     extra_vars:
-      image_name: '{{.BeatName}}-ubi8'
-      from: 'registry.access.redhat.com/ubi8/ubi-minimal:8.2'
+      image_name: '{{.BeatName}}-ubi9'
+      from: 'registry.access.redhat.com/ubi9/ubi-minimal:9.2'
 
   - &elastic_docker_spec
     extra_vars:

diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
@@ -22,7 +22,7 @@ FROM {{ .from }}
 
 {{- if contains .from "ubi-minimal" }}
 RUN microdnf -y update && \
-    microdnf install findutils shadow-utils && \
+    microdnf -y install findutils shadow-utils && \
     microdnf clean all
 {{- else }}
 RUN for iter in {1..10}; do \

diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
@@ -3,8 +3,12 @@
 # Extract Auditbeat and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
+<<<<<<< HEAD
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 
+=======
+ARG BASE_IMAGE=redhat/ubi/ubi9
+>>>>>>> d4630af1cf (ironbank: move to ubi9 (#37017))
 ARG BASE_TAG=9.2
 
 

diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
@@ -12,7 +12,7 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "auditbeat"

diff --git a/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile b/dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
@@ -3,7 +3,7 @@
 # Extract Filebeat and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_IMAGE=redhat/ubi/ubi9
 ARG BASE_TAG=9.2
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder

diff --git a/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
@@ -12,7 +12,7 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "filebeat"

diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
@@ -3,7 +3,7 @@
 # Extract Heartbeat and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_IMAGE=redhat/ubi/ubi9
 ARG BASE_TAG=9.2
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files

diff --git a/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
@@ -12,7 +12,7 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "heartbeat"

diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
@@ -3,7 +3,7 @@
 # Extract Metricbeat and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_IMAGE=redhat/ubi/ubi9
 ARG BASE_TAG=9.2
 
 

diff --git a/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
@@ -12,7 +12,7 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "metricbeat"

diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile b/dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
@@ -3,7 +3,7 @@
 # Extract Packetbeat and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_IMAGE=redhat/ubi/ubi9
 ARG BASE_TAG=9.2
 
 

diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
@@ -12,7 +12,7 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "packetbeat"

diff --git a/x-pack/heartbeat/ironbank/Makefile b/x-pack/heartbeat/ironbank/Makefile
@@ -48,6 +48,6 @@ package: ## Package heartbeat for the artifacts consumed by the ironbank docker
 validate-ironbank: prepare
 	docker build \
 		--build-arg BASE_REGISTRY=docker.elastic.co \
-		--build-arg BASE_IMAGE=ubi8/ubi \
+		--build-arg BASE_IMAGE=ubi9/ubi \
 		--build-arg BASE_TAG=latest \
 		$(LOCATION)