File tree Expand file tree Collapse file tree 4 files changed +20
-20
lines changed Expand file tree Collapse file tree 4 files changed +20
-20
lines changed Original file line number Diff line number Diff line change 1
1
ARG BASE_REGISTRY=registry.access.redhat.com
2
2
ARG BASE_IMAGE=ubi8-minimal
3
- ARG BASE_TAG=8.8
3
+ ARG BASE_TAG=latest
4
4
5
5
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
6
6
COPY bundle.tar.gz /
7
7
8
8
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
10
10
11
11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
12
12
@@ -31,11 +31,11 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${
31
31
rpm -i /tmp/pg_repo.rpm && \
32
32
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
33
33
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 && \
36
36
groupadd -g 70 postgres && \
37
37
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
38
- microdnf install -y \
38
+ microdnf install \
39
39
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
40
40
postgresql12-server && \
41
41
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
Original file line number Diff line number Diff line change 1
1
ARG BASE_REGISTRY =registry.access.redhat.com
2
2
ARG BASE_IMAGE =ubi8-minimal
3
- ARG BASE_TAG =8.8
3
+ ARG BASE_TAG =latest
4
4
5
5
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
6
6
COPY bundle.tar.gz /
7
7
8
8
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
10
10
11
11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
12
12
@@ -31,11 +31,11 @@ RUN curl -sSLf https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-${
31
31
rpm -i /tmp/pg_repo.rpm && \
32
32
# Skip repo check for ARM as it's used only for development purposes and package has wrong signature.
33
33
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 && \
36
36
groupadd -g 70 postgres && \
37
37
adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
38
- microdnf install -y \
38
+ microdnf install \
39
39
ca-certificates libicu systemd-sysv glibc-locale-source glibc-langpack-en \
40
40
postgresql12-server && \
41
41
# The removal of /usr/share/zoneinfo from UBI minimal images is intentional.
Original file line number Diff line number Diff line change 1
1
ARG BASE_REGISTRY=registry.access.redhat.com
2
2
ARG BASE_IMAGE=ubi8-minimal
3
- ARG BASE_TAG=8.8
3
+ ARG BASE_TAG=latest
4
4
5
5
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
6
6
7
7
COPY bundle.tar.gz /
8
8
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
10
10
11
11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
12
12
@@ -24,9 +24,9 @@ COPY --from=extracted_bundle /bundle/scanner ./
24
24
25
25
COPY --from=extracted_bundle /bundle/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
26
26
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 && \
30
30
# (Optional) Remove line below to keep package management utilities
31
31
# We don't uninstall rpm because scanner uses it to get packages installed in scanned images.
32
32
rpm -e --nodeps $(rpm -qa curl '*dnf*' '*libsolv*' '*hawkey*' 'yum*' ) && \
Original file line number Diff line number Diff line change 1
1
ARG BASE_REGISTRY =registry.access.redhat.com
2
2
ARG BASE_IMAGE =ubi8-minimal
3
- ARG BASE_TAG =8.8
3
+ ARG BASE_TAG =latest
4
4
5
5
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
6
6
7
7
COPY bundle.tar.gz /
8
8
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
10
10
11
11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
12
12
@@ -24,9 +24,9 @@ COPY --from=extracted_bundle /bundle/scanner ./
24
24
25
25
COPY --from =extracted_bundle /bundle/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
26
26
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 && \
30
30
# (Optional) Remove line below to keep package management utilities
31
31
# We don't uninstall rpm because scanner uses it to get packages installed in scanned images.
32
32
rpm -e --nodeps $(rpm -qa curl '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \
You can’t perform that action at this time.
0 commit comments