Skip to content

Commit b1fe97d

Browse files
committed
chore: upgrade UBI images to v10.2
Upgrade UBI images to 10.2. With this update, dbus-glib and iptables are not available on UBI v10.2, but checking the playwright dependencies, both packages are not listed in the version in use.
1 parent 14d1ed6 commit b1fe97d

14 files changed

Lines changed: 74 additions & 29 deletions

File tree

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# REQUIRED
2+
# Kind can be one of:
3+
# - breaking-change: a change to previously-documented behavior
4+
# - deprecation: functionality that is being removed in a later release
5+
# - bug-fix: fixes a problem in a previous version
6+
# - enhancement: extends functionality but does not break or fix existing behavior
7+
# - feature: new functionality
8+
# - known-issue: problems that we are aware of in a given version
9+
# - security: impacts on the security of a product or a user’s deployment.
10+
# - upgrade: important information for someone upgrading from a prior version
11+
# - other: does not fit into any of the other categories
12+
kind: other
13+
14+
# REQUIRED for all kinds
15+
# Change summary; a 80ish characters long description of the change.
16+
summary: update UBI images to v10.2
17+
18+
# REQUIRED for breaking-change, deprecation, known-issue
19+
# Long description; in case the summary is not enough to describe the change
20+
# this field accommodate a description without length limits.
21+
# description:
22+
23+
# REQUIRED for breaking-change, deprecation, known-issue
24+
# impact:
25+
26+
# REQUIRED for breaking-change, deprecation, known-issue
27+
# action:
28+
29+
# REQUIRED for all kinds
30+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
31+
component: all
32+
33+
# AUTOMATED
34+
# OPTIONAL to manually add other PR URLs
35+
# PR URL: A link the PR that added the changeset.
36+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
37+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
38+
# Please provide it if you are adding a fragment for a different PR.
39+
# pr: https://github.com/owner/repo/1234
40+
41+
# AUTOMATED
42+
# OPTIONAL to manually add other issue URLs
43+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
44+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
45+
# issue: https://github.com/owner/repo/1234

dev-tools/dependencies-report

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ go list -m -json all $@ | go run go.elastic.co/go-licence-detector \
4646
# Fill-in required values for UBI images
4747
# Check headers in $SRCPATH/notice/dependencies.csv.tmpl:
4848
# name,url,version,revision,license
49-
ubiurl='https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5'
50-
ubisource='https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz'
49+
ubiurl='https://catalog.redhat.com/software/containers/ubi10/ubi-minimal/66f1504a379b9c2cf23e145c'
50+
ubisource='https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/10/ubi-minimal-10-source.tar.gz'
5151
ubilicense='Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf'
5252
cat <<EOF >> $outfile
53-
Red Hat Universal Base Image minimal,$ubiurl,9,,$ubilicense,$ubisource
53+
Red Hat Universal Base Image minimal,$ubiurl,10,,$ubilicense,$ubisource
5454
EOF

dev-tools/packaging/packages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ shared:
170170
- &docker_spec
171171
<<: *binary_spec
172172
extra_vars:
173-
from: '--platform=linux/amd64 redhat/ubi9-minimal'
173+
from: '--platform=linux/amd64 redhat/ubi10-minimal'
174174
buildFrom: '--platform=linux/amd64 cgr.dev/chainguard/wolfi-base'
175175
user: '{{ .BeatName }}'
176176
linux_capabilities: ''
@@ -183,18 +183,18 @@ shared:
183183
- &docker_arm_spec
184184
<<: *docker_spec
185185
extra_vars:
186-
from: '--platform=linux/arm64 redhat/ubi9-minimal'
186+
from: '--platform=linux/arm64 redhat/ubi10-minimal'
187187
buildFrom: '--platform=linux/arm64 cgr.dev/chainguard/wolfi-base'
188188

189189
- &docker_ubi_spec
190190
extra_vars:
191191
image_name: '{{.BeatName}}-ubi'
192-
from: '--platform=linux/amd64 redhat/ubi9-minimal'
192+
from: '--platform=linux/amd64 redhat/ubi10-minimal'
193193

194194
- &docker_arm_ubi_spec
195195
extra_vars:
196196
image_name: '{{.BeatName}}-ubi'
197-
from: '--platform=linux/arm64 redhat/ubi9-minimal'
197+
from: '--platform=linux/arm64 redhat/ubi10-minimal'
198198

199199
- &docker_wolfi_spec
200200
extra_vars:

dev-tools/packaging/templates/docker/Dockerfile.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ USER {{ .user }}
158158
RUN (npm i -g --loglevel verbose --production --engine-strict @elastic/synthetics@stack_release || sh -c 'tail -n +1 ${NPM_CONFIG_PREFIX}/_logs/* && exit 1')
159159
{{- end }}
160160
161-
{{- if (and (eq .BeatName "heartbeat") (contains .from "ubi9-minimal")) }}
161+
{{- if (and (eq .BeatName "heartbeat") (contains .from "ubi10-minimal")) }}
162162
USER root
163163
164164
# Install the deps as needed by the exact version of playwright elastic synthetics uses
@@ -169,7 +169,7 @@ RUN for iter in {1..10}; do \
169169
microdnf -y install fontconfig freetype cairo glib2 gtk3 pango xorg-x11-fonts-misc xorg-x11-fonts-Type1 \
170170
at-spi2-atk atk at-spi2-core alsa-lib cups-libs dbus-libs libdrm mesa-libEGL mesa-libgbm nspr nss libX11 \
171171
libX11-xcb libxcb libXcomposite libXdamage libXext libXfixes libXrandr libxkbcommon libxshmfence glib2 \
172-
dbus-glib libicu mesa-libGL unzip \
172+
libicu mesa-libGL unzip \
173173
findutils shadow-utils ca-certificates gawk libcap xz tar -y && \
174174
mkdir -p /usr/share/fonts/google-noto && \
175175
curl -L -o NotoSansCJKjp.zip https://github.com/notofonts/noto-cjk/releases/download/Sans2.004/06_NotoSansCJKjp.zip && \

dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Extract Auditbeat and make various file manipulations.
44
################################################################################
55
ARG BASE_REGISTRY=registry1.dsop.io
6-
ARG BASE_IMAGE=redhat/ubi/ubi9
7-
ARG BASE_TAG=10.1
6+
ARG BASE_IMAGE=redhat/ubi/ubi10
7+
ARG BASE_TAG=10.2
88

99
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
1010

dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ tags:
1313

1414
# Build args passed to Dockerfile ARGs
1515
args:
16-
BASE_IMAGE: "redhat/ubi/ubi9"
17-
BASE_TAG: "10.1"
16+
BASE_IMAGE: "redhat/ubi/ubi10"
17+
BASE_TAG: "10.2"
1818
ELASTIC_STACK: "{{ beat_version }}"
1919
ELASTIC_PRODUCT: "auditbeat"
2020

dev-tools/packaging/templates/ironbank/filebeat/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Extract Filebeat and make various file manipulations.
44
################################################################################
55
ARG BASE_REGISTRY=registry1.dsop.io
6-
ARG BASE_IMAGE=redhat/ubi/ubi9
7-
ARG BASE_TAG=10.1
6+
ARG BASE_IMAGE=redhat/ubi/ubi10
7+
ARG BASE_TAG=10.2
88

99
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder
1010

dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ tags:
1313

1414
# Build args passed to Dockerfile ARGs
1515
args:
16-
BASE_IMAGE: "redhat/ubi/ubi9"
17-
BASE_TAG: "10.1"
16+
BASE_IMAGE: "redhat/ubi/ubi10"
17+
BASE_TAG: "10.2"
1818
ELASTIC_STACK: "{{ beat_version }}"
1919
ELASTIC_PRODUCT: "filebeat"
2020

dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Extract Heartbeat and make various file manipulations.
44
################################################################################
55
ARG BASE_REGISTRY=registry1.dsop.io
6-
ARG BASE_IMAGE=redhat/ubi/ubi9
7-
ARG BASE_TAG=10.1
6+
ARG BASE_IMAGE=redhat/ubi/ubi10
7+
ARG BASE_TAG=10.2
88

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

dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ tags:
1313

1414
# Build args passed to Dockerfile ARGs
1515
args:
16-
BASE_IMAGE: "redhat/ubi/ubi9"
17-
BASE_TAG: "10.1"
16+
BASE_IMAGE: "redhat/ubi/ubi10"
17+
BASE_TAG: "10.2"
1818
ELASTIC_STACK: "{{ beat_version }}"
1919
ELASTIC_PRODUCT: "heartbeat"
2020

0 commit comments

Comments
 (0)