diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 0b7d459834e..e78a400747b 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -202,7 +202,7 @@ pipeline { images: [ [ source: "beats/elastic-agent", arch: env.ARCH, target: "observability-ci/elastic-agent"], [ source: "beats/elastic-agent-oss", arch: env.ARCH, target: "observability-ci/elastic-agent-oss"], - [ source: "beats/elastic-agent-ubi8", arch: env.ARCH, target: "observability-ci/elastic-agent-ubi8"], + [ source: "beats/elastic-agent-ubi9", arch: env.ARCH, target: "observability-ci/elastic-agent-ubi9"], [ source: "beats/elastic-agent-complete", arch: env.ARCH, target: "observability-ci/elastic-agent-complete"], [ source: "beats-ci/elastic-agent-cloud", arch: env.ARCH, target: "observability-ci/elastic-agent-cloud"] ] diff --git a/dev-tools/dependencies-report b/dev-tools/dependencies-report index 5e0ec665df7..2d71c9015b1 100755 --- 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 <> $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 index c513effc15a..ec7f7e659c0 100644 --- a/dev-tools/packaging/packages.yml +++ b/dev-tools/packaging/packages.yml @@ -421,13 +421,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/ironbank/Dockerfile.tmpl b/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl index 84037fc788d..8d4c4aa9990 100644 --- a/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl @@ -3,8 +3,8 @@ # Extract Elastic Agent and make various file manipulations. ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io -ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.8 +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/hardening_manifest.yaml.tmpl b/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl index 02e64e68c86..e0b1e0d80c7 100644 --- a/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl +++ b/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl @@ -13,8 +13,8 @@ tags: # Build args passed to Dockerfile ARGs args: - BASE_IMAGE: "redhat/ubi/ubi8" - BASE_TAG: "8.8" + BASE_IMAGE: "redhat/ubi/ubi9" + BASE_TAG: "9.2" ELASTIC_STACK: "{{ beat_version }}" ELASTIC_PRODUCT: "elastic-agent"