Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions components/image-collector/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Rather than build the binary, retrieve the already-built binary from
# the OpenTelemetry image
FROM otel/opentelemetry-collector-contrib:0.147.0 AS collector
FROM otel/opentelemetry-collector-contrib:0.152.0 AS collector

# Aggregate the collector licenses from binary
# and from root of the PGO repo
Expand Down Expand Up @@ -34,6 +34,7 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal
COPY --from=build --chmod=0777 /otelcol-contrib /otelcol-contrib
COPY --from=build /licenses /licenses

RUN microdnf install -y 'logrotate' 'procps-ng'
RUN microdnf update -y --nodocs \
&& microdnf install -y 'logrotate' 'procps-ng'

USER 2
3 changes: 2 additions & 1 deletion components/image-pgadmin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_VERSION=ubi9
ARG PGADMIN4_VERSION=9.13
ARG PGADMIN4_VERSION=9.15
ARG PYTHON_VERSION=3.11
ARG PG_MAJOR=18

Expand Down Expand Up @@ -97,6 +97,7 @@ ARG BASE_VERSION

RUN rpm -ivh "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${BASE_VERSION##ubi}.noarch.rpm" \
&& rpm -ivh "https://download.postgresql.org/pub/repos/yum/reporpms/EL-${BASE_VERSION##ubi}-$(arch)/pgdg-redhat-repo-latest.noarch.rpm" \
&& microdnf update -y --nodocs \
&& microdnf install -y --nodocs --setopt install_weak_deps=0 \
--enablerepo='epel' \
'krb5-libs' \
Expand Down
1 change: 1 addition & 0 deletions components/image-pgbackrest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN rpm -ivh \
# Delete the repo file as it is large and unneeded.
ARG PGBACKREST_VERSION
RUN rpm -ivh "https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-$(arch)/pgdg-redhat-repo-latest.noarch.rpm" \
&& microdnf update -y --nodocs \
&& microdnf install -y --nodocs --setopt install_weak_deps=0 'shadow-utils' \
&& groupadd --gid 26 postgres \
&& useradd --gid 26 --uid 26 --no-log-init postgres \
Expand Down
3 changes: 2 additions & 1 deletion components/image-pgbouncer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

FROM registry.access.redhat.com/ubi9/ubi-minimal

ARG PGBOUNCER_VERSION=1.24.1
ARG PGBOUNCER_VERSION=1.25.2

# The c-ares package is in the rhel-9-for-$(arch)-baseos-rpms repo, so we must enable it
RUN rpm -ivh "https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-$(arch)/pgdg-redhat-repo-latest.noarch.rpm" \
&& microdnf update -y --nodocs \
&& microdnf install -y --nodocs --setopt install_weak_deps=0 \
--enablerepo="rhel-9-for-$(arch)-baseos-rpms" \
"pgbouncer-${PGBOUNCER_VERSION}" \
Expand Down
4 changes: 4 additions & 0 deletions components/image-postgres/Dockerfile.postgis
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ rpm -ivh "https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-$(arch)/pg
# Disable module to avoid conflicts
microdnf --assumeyes module disable postgresql || true

# Refresh base packages so any CVE patches that landed in the upstream
# repos after the parent crunchy-postgres image was built are picked up.
microdnf update -y --nodocs

microdnf install -y --nodocs --setopt install_weak_deps=0 \
--enablerepo="codeready-builder-for-rhel-9-$(arch)-rpms" \
perl \
Expand Down
7 changes: 6 additions & 1 deletion components/image-postgres/Dockerfile.postgres
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

FROM registry.access.redhat.com/ubi9/ubi-minimal

ARG PATRONI_VERSION=4.0.6
ARG PATRONI_VERSION=4.1.3
ARG PGBACKREST_VERSION=2.58.0
ARG POSTGRES_VERSION=18

Expand Down Expand Up @@ -32,6 +32,11 @@ rpm -ivh "https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
# Disable the built-in PostgreSQL module to avoid conflicts with PGDG packages
microdnf --assumeyes module disable postgresql || true

# Refresh all base-image packages against the current RHEL/EPEL/PGDG repos so
# the build picks up CVE patches that landed after ubi-minimal was last
# republished.
microdnf update -y --nodocs

# Ensure complete timezone database is present (some minimal UBI layers
# can have tzdata partially pruned); reinstall guarantees fresh /usr/share/zoneinfo
microdnf reinstall -y --nodocs 'tzdata'
Expand Down
4 changes: 4 additions & 0 deletions components/image-postgres/Dockerfile.postgres-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ rpm -ivh "https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-$(arch)/pg
# Disable module to avoid conflicts
microdnf --assumeyes module disable postgresql || true

# Refresh base packages so any CVE patches that landed in the upstream
# repos after the parent crunchy-postgres image was built are picked up.
microdnf update -y --nodocs

# Build package list for all target versions
PKGS="$(for POSTGRES_VERSION in ${POSTGRES_UPGRADE_VERSIONS}; do
POSTGRES_MAJOR_VERSION="${POSTGRES_VERSION%.*}"
Expand Down
Loading