Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.10](backport #3691) ironbank: move to ubi9 #3709

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
]
Expand Down
6 changes: 3 additions & 3 deletions dev-tools/dependencies-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions dev-tools/packaging/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions dev-tools/packaging/templates/ironbank/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
# Extract Elastic Agent and make various file manipulations.
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
<<<<<<< HEAD
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.8
=======
ARG BASE_IMAGE=redhat/ubi/ubi9
ARG BASE_TAG=9.2
>>>>>>> a956f6436a (ironbank: move to ubi9 (#3691))
v1v marked this conversation as resolved.
Show resolved Hide resolved

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ tags:

# Build args passed to Dockerfile ARGs
args:
<<<<<<< HEAD
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.8"
=======
BASE_IMAGE: "redhat/ubi/ubi9"
BASE_TAG: "9.2"
>>>>>>> a956f6436a (ironbank: move to ubi9 (#3691))
ELASTIC_STACK: "{{ beat_version }}"
v1v marked this conversation as resolved.
Show resolved Hide resolved
ELASTIC_PRODUCT: "elastic-agent"

Expand Down
Loading