Skip to content

Commit

Permalink
ironbank: support for ubi9 (elastic#11999)
Browse files Browse the repository at this point in the history
* Revert "ironbank: remove support for ubi9 (elastic#11991)"

This reverts commit abd2f78.

* Revert "dra: rename ubi8 for ubi9 (elastic#11990)"

This reverts commit 68aaf6f.

* update dependencies
  • Loading branch information
v1v authored Nov 10, 2023
1 parent 98bf411 commit 0a2fedb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions packaging/ironbank/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Extract APM Server 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

Expand Down
4 changes: 2 additions & 2 deletions packaging/ironbank/hardening_manifest.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,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: "apm-server"

Expand Down
6 changes: 3 additions & 3 deletions script/generate_notice.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
# Additional third-party, non-source code dependencies, to add to the CSV output.
additional_third_party_deps = [{
"name": "Red Hat Universal Base Image minimal",
"version": "8",
"url": "https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8",
"version": "9",
"url": "https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5",
"license": "Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf",
"sourceURL": "https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz",
"sourceURL": "https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz",
}]


Expand Down

0 comments on commit 0a2fedb

Please sign in to comment.