Skip to content

Commit 350e2c1

Browse files
horshors
authored
K8SPG-611 use official PG image (#1232)
1 parent b25bc9e commit 350e2c1

File tree

8 files changed

+30
-7
lines changed

8 files changed

+30
-7
lines changed

‎percona-distribution-postgresql-13/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ RUN microdnf -y update; \
1515
microdnf -y install glibc-langpack-en; \
1616
microdnf -y install systemd-rpm-macros
1717

18+
ARG PPG_REPO=testing
19+
1820
ENV PPG_VERSION 13.20-1
1921
ENV PPG_MAJOR_VERSION 13
2022
ENV PPG_MINOR_VERSION 20
2123
ENV OS_VER el9
2224
ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
23-
ENV PPG_REPO testing
25+
ENV PPG_REPO ${PPG_REPO}
2426
ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
2527

2628
# Do not report during Docker image creation.

‎percona-distribution-postgresql-14/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ RUN microdnf -y update; \
1515
microdnf -y install glibc-langpack-en; \
1616
microdnf -y install systemd-rpm-macros
1717

18+
ARG PPG_REPO=testing
19+
1820
ENV PPG_VERSION 14.17-1
1921
ENV PPG_MAJOR_VERSION 14
2022
ENV PPG_MINOR_VERSION 17
2123
ENV OS_VER el9
2224
ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
23-
ENV PPG_REPO testing
25+
ENV PPG_REPO ${PPG_REPO}
2426
ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
2527

2628
# Do not report during Docker image creation.

‎percona-distribution-postgresql-15/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ RUN microdnf -y update; \
1515
microdnf -y install glibc-langpack-en; \
1616
microdnf -y install systemd-rpm-macros
1717

18+
ARG PPG_REPO=testing
19+
1820
ENV PPG_VERSION 15.12-1
1921
ENV PPG_MAJOR_VERSION 15
2022
ENV PPG_MINOR_VERSION 12
2123
ENV OS_VER el9
2224
ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
23-
ENV PPG_REPO testing
25+
ENV PPG_REPO ${PPG_REPO}
2426
ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
2527

2628
# Do not report during Docker image creation.

‎percona-distribution-postgresql-16/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ RUN microdnf -y update; \
1515
microdnf -y install glibc-langpack-en; \
1616
microdnf -y install systemd-rpm-macros
1717

18+
ARG PPG_REPO=testing
19+
1820
ENV PPG_VERSION 16.8-1
1921
ENV PPG_MAJOR_VERSION 16
2022
ENV PPG_MINOR_VERSION 8
2123
ENV OS_VER el9
2224
ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
23-
ENV PPG_REPO testing
25+
ENV PPG_REPO ${PPG_REPO}
2426
ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
2527

2628
# Do not report during Docker image creation.

‎percona-distribution-postgresql-17/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ RUN microdnf -y update; \
1515
microdnf -y install glibc-langpack-en; \
1616
microdnf -y install systemd-rpm-macros
1717

18+
ARG PPG_REPO=testing
19+
1820
ENV PPG_VERSION 17.5-2
1921
ENV PPG_MAJOR_VERSION 17
2022
ENV PPG_MINOR_VERSION 5
2123
ENV OS_VER el9
2224
ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
23-
ENV PPG_REPO testing
25+
ENV PPG_REPO ${PPG_REPO}
2426
ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
2527

2628
# Do not report during Docker image creation.

‎percona-pgbackrest/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ LABEL name="Percona pgBackRest" \
88
org.opencontainers.image.authors="info@percona.com"
99

1010
ARG PG_VERSION=17.5
11+
ARG PPG_REPO=release
12+
1113
ENV PG_VERSION=${PG_VERSION}
12-
ENV PPG_REPO release
14+
ENV PPG_REPO=${PPG_REPO}
1315
# check repository package signature in secure way
1416
RUN set -ex; \
1517
ARCH=$(uname -m) && echo "Architecture is: $ARCH" && \

‎percona-pgbouncer/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ LABEL name="Percona PgBouncer" \
88
org.opencontainers.image.authors="info@percona.com"
99

1010
ARG PG_VERSION=17.5
11+
ARG PPG_REPO=release
1112
ENV PG_VERSION=${PG_VERSION}
12-
ENV PPG_REPO release
13+
ENV PPG_REPO=${PPG_REPO}
1314

1415
# check repository package signature in secure way
1516
RUN set -ex; \

‎postgresql-containers/build/postgres-gis/Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ LABEL name="Percona PostgreSQL Distribution" \
1313
USER 0
1414

1515
ARG PG_MAJOR=14
16+
ARG PPG_REPO=testing
17+
18+
ENV PPG_REPO ${PPG_REPO}
19+
20+
RUN set -ex; \
21+
export GNUPGHOME="$(mktemp -d)"; \
22+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 567E347AD0044ADE55BA8A5F199E2F91FD431D51; \
23+
gpg --batch --export --armor 567E347AD0044ADE55BA8A5F199E2F91FD431D51 > /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release; \
24+
rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release; \
25+
percona-release enable ppg-${PG_MAJOR%%.*} ${PPG_REPO}
1626

1727
RUN set -ex; \
1828
yum-config-manager --enable ol9_codeready_builder ol9_developer_EPEL ol9_baseos_latest ol9_appstream; \

0 commit comments

Comments
 (0)