Skip to content

Commit db4c377

Browse files
authored
build: use ubi8 latest (#1241)
1 parent e4892d2 commit db4c377

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

image/db/rhel/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
22
ARG BASE_IMAGE=ubi8-minimal
3-
ARG BASE_TAG=8.8
3+
ARG BASE_TAG=latest
44

55
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
66
COPY bundle.tar.gz /
77

88
WORKDIR /bundle
9-
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz
9+
RUN microdnf install tar gzip && tar -zxf /bundle.tar.gz
1010

1111
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
1212

@@ -31,11 +31,11 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${
3131
rpm -i /tmp/pg_repo.rpm && \
3232
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
3333
if [[ "$POSTGRESQL_ARCH" == "aarch64" ]]; then sed -i 's/repo_gpgcheck = 1/repo_gpgcheck = 0/g' /etc/yum.repos.d/pgdg-redhat-all.repo; fi && \
34-
microdnf upgrade -y && \
35-
microdnf install -y shadow-utils && \
34+
microdnf upgrade --nobest && \
35+
microdnf install shadow-utils && \
3636
groupadd -g 70 postgres && \
3737
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
38-
microdnf install -y \
38+
microdnf install \
3939
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
4040
postgresql12-server && \
4141
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.

image/db/rhel/Dockerfile.slim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
22
ARG BASE_IMAGE=ubi8-minimal
3-
ARG BASE_TAG=8.8
3+
ARG BASE_TAG=latest
44

55
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
66
COPY bundle.tar.gz /
77

88
WORKDIR /bundle
9-
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz
9+
RUN microdnf install tar gzip && tar -zxf /bundle.tar.gz
1010

1111
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
1212

@@ -31,11 +31,11 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${
3131
rpm -i /tmp/pg_repo.rpm && \
3232
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
3333
if [[ "$POSTGRESQL_ARCH" == "aarch64" ]]; then sed -i 's/repo_gpgcheck = 1/repo_gpgcheck = 0/g' /etc/yum.repos.d/pgdg-redhat-all.repo; fi && \
34-
microdnf upgrade -y && \
35-
microdnf install -y shadow-utils && \
34+
microdnf upgrade --nobest && \
35+
microdnf install shadow-utils && \
3636
groupadd -g 70 postgres && \
3737
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
38-
microdnf install -y \
38+
microdnf install \
3939
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
4040
postgresql12-server && \
4141
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.

image/scanner/rhel/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
22
ARG BASE_IMAGE=ubi8-minimal
3-
ARG BASE_TAG=8.8
3+
ARG BASE_TAG=latest
44

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

77
COPY bundle.tar.gz /
88
WORKDIR /bundle
9-
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz
9+
RUN microdnf install tar gzip && tar -zxf /bundle.tar.gz
1010

1111
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
1212

@@ -24,9 +24,9 @@ COPY --from=extracted_bundle /bundle/scanner ./
2424

2525
COPY --from=extracted_bundle /bundle/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
2626

27-
RUN microdnf -y upgrade && \
28-
microdnf -y install xz && \
29-
microdnf -y clean all && \
27+
RUN microdnf upgrade --nobest && \
28+
microdnf install xz && \
29+
microdnf clean all && \
3030
# (Optional) Remove line below to keep package management utilities
3131
# We don't uninstall rpm because scanner uses it to get packages installed in scanned images.
3232
rpm -e --nodeps $(rpm -qa curl '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \

image/scanner/rhel/Dockerfile.slim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG BASE_REGISTRY=registry.access.redhat.com
22
ARG BASE_IMAGE=ubi8-minimal
3-
ARG BASE_TAG=8.8
3+
ARG BASE_TAG=latest
44

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

77
COPY bundle.tar.gz /
88
WORKDIR /bundle
9-
RUN microdnf -y install tar gzip && tar -zxf /bundle.tar.gz
9+
RUN microdnf install tar gzip && tar -zxf /bundle.tar.gz
1010

1111
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
1212

@@ -24,9 +24,9 @@ COPY --from=extracted_bundle /bundle/scanner ./
2424

2525
COPY --from=extracted_bundle /bundle/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
2626

27-
RUN microdnf -y upgrade && \
28-
microdnf -y install xz && \
29-
microdnf -y clean all && \
27+
RUN microdnf upgrade --nobest && \
28+
microdnf install xz && \
29+
microdnf clean all && \
3030
# (Optional) Remove line below to keep package management utilities
3131
# We don't uninstall rpm because scanner uses it to get packages installed in scanned images.
3232
rpm -e --nodeps $(rpm -qa curl '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \

0 commit comments

Comments
 (0)