Skip to content

Commit 4ee8d1f

Browse files
authored
ROX-31971: update ubi and centos base images to 10 (#2692)
1 parent d759b32 commit 4ee8d1f

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Generate coverage report
4949
run: |
50-
dnf install -y python-pip
50+
dnf install -y python-pip gpg
5151
pip install gcovr
5252
gcovr \
5353
--xml /tmp/xml-report/ \

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/centos/centos:stream9
1+
FROM quay.io/centos/centos:stream10
22

33
ARG BUILD_DIR=/install-tmp
44
ARG COLLECTOR_BUILDER_DEBUG

builder/third_party/tbb

Submodule tbb updated from 0c0ff19 to 0cd32ab

collector/container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
1+
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest
22

33
ARG BUILD_TYPE=rhel
44
ARG ROOT_DIR=.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/usr/bin/env bash
22
set -eo pipefail
33

4-
# UBI 9 requires confirmation with -y flag.
54
microdnf upgrade -y --nobest
65
microdnf install -y elfutils-libelf
76

87
microdnf clean all
98
# shellcheck disable=SC2046
109
rpm --verbose -e --nodeps $(
11-
rpm -qa 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*'
10+
rpm -qa '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*'
1211
)
1312
rm -rf /var/cache/yum

0 commit comments

Comments
 (0)