Skip to content

Commit 081e2fc

Browse files
Update to ubi8 (#139)
Upgrade to UBI8
1 parent 7a17028 commit 081e2fc

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

image/db/rhel/Dockerfile

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
2-
ARG BASE_IMAGE=ubi7/ubi
3-
ARG BASE_TAG=7.7
2+
ARG BASE_IMAGE=ubi8/ubi
3+
ARG BASE_TAG=8.1
44

55
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
66

@@ -21,20 +21,27 @@ RUN yum update -y --nogpgcheck --disableplugin=subscription-manager && \
2121
systemd-sysv \
2222
postgres-libs.rpm \
2323
postgres-server.rpm \
24-
postgres.rpm && \
24+
postgres.rpm \
25+
# glibc-locale-source and glibc-langpack-en added in the UBI8 upgrade because they're no longer in the base image
26+
glibc-locale-source \
27+
glibc-langpack-en && \
2528
rm postgres-libs.rpm postgres-server.rpm postgres.rpm \
2629
;
2730

2831
RUN rpm -e --nodeps \
2932
rpm \
3033
rpm-build-libs \
3134
rpm-libs \
32-
rpm-python \
35+
python3-rpm \
3336
subscription-manager \
34-
subscription-manager-rhsm \
37+
python3-subscription-manager-rhsm \
3538
yum \
36-
yum-plugin-ovl \
37-
yum-utils \
39+
# Addded in UBI8 upgrade, need to remove it because it depends on dnf
40+
$(rpm -qa *hawkey*) \
41+
# Added in UBI8 upgrade, need to remove it so we don't violate our "no package manager" policy
42+
$(rpm -qa *dnf*) \
43+
# Added in UBI8 upgrade, need to remove it so we don't violate our "no curl" policy
44+
curl \
3845
;
3946

4047
RUN localedef -f UTF-8 -i en_US en_US.UTF-8

image/db/rhel/create-bundle.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ cp -p "${INPUT_ROOT}/dump/definitions.sql.gz" "${bundle_root}/docker-entrypoint-
3131
cp -p "${INPUT_ROOT}/rhel/docker-entrypoint.sh" "${bundle_root}/usr/local/bin/"
3232
cp -p "${INPUT_ROOT}"/*.conf "${bundle_root}/etc/"
3333

34-
postgres_url="https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-7.7-x86_64"
34+
postgres_url="https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-8.1-x86_64"
3535
postgres_major="12"
36-
postgres_minor="12.1-2PGDG.rhel7.x86_64"
36+
postgres_minor="12.1-2PGDG.rhel8.x86_64"
3737

3838
curl -s -o "${bundle_root}/postgres.rpm" \
3939
"${postgres_url}/postgresql${postgres_major}-${postgres_minor}.rpm"

image/scanner/rhel/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
2-
ARG BASE_IMAGE=ubi7/ubi
3-
ARG BASE_TAG=7.7
2+
ARG BASE_IMAGE=ubi8/ubi
3+
ARG BASE_TAG=8.1
44

55
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
66

@@ -9,7 +9,8 @@ SHELL ["/bin/sh", "-o", "pipefail", "-c"]
99
RUN yum update -y --nogpgcheck --disableplugin=subscription-manager && \
1010
yum install -y --nogpgcheck --disableplugin=subscription-manager \
1111
ca-certificates xz && \
12-
rpm -e subscription-manager yum yum-utils yum-plugin-ovl \
12+
# hawkey and dnf added in UBI8 upgrade so we don't violate our "no package manager" policy
13+
rpm -e subscription-manager yum $(rpm -qa *hawkey*) $(rpm -qa *dnf*) \
1314
;
1415

1516
ADD bundle.tar.gz /

0 commit comments

Comments
 (0)