Update PostgreSQL repository for CentOS 7 builds

Author: crunchyheath

centos7/Dockerfile.pgo-apiserver.centos7

@@ -7,12 +7,10 @@ LABEL name="pgo-apiserver" \
 	summary="Crunchy PostgreSQL Operator - Apiserver" \
 	description="Crunchy PostgreSQL Operator - Apiserver"
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
+ENV PGVERSION="12"
 
 # PGDG PostgreSQL Repository
 
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
-
 RUN yum -y install postgresql12 hostname && yum -y clean all
 
 ADD bin/apiserver /usr/local/bin

centos7/Dockerfile.pgo-backrest-repo-sync.centos7

@@ -7,17 +7,13 @@ LABEL name="pgo-backrest-repo-sync" \
 	summary="Crunchy PostgreSQL Operator - pgBackRest Repo Sync" \
 	description="Synchronizes the contents between two pgBackRest repositories."
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg*" PGDG_REPO_ENABLE="pgdg12" \
-    BACKREST_VERSION="2.20"
-
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12" BACKREST_VERSION="2.20"
 
 RUN yum -y install \
-    --disablerepo="${PGDG_REPO_DISABLE}" \
-    --enablerepo="${PGDG_REPO_ENABLE}" \
+    --setopt=skip_missing_names_on_install=False \
     openssh-clients \
     openssh-server \
-    pgbackrest-"${BACKREST_VERSION}" \
+    crunchy-backrest-"${BACKREST_VERSION}" \
     procps-ng \
     psmisc \
     rsync \

centos7/Dockerfile.pgo-backrest-repo.centos7

@@ -7,19 +7,14 @@ LABEL name="pgo-backrest-repo" \
 	summary="Crunchy PostgreSQL Operator - pgBackRest Repository" \
 	description="Crunchy PostgreSQL Operator - pgBackRest Repository"
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg*" PGDG_REPO_ENABLE="pgdg12"\
-    BACKREST_VERSION="2.20"
-
-# PGDG PostgreSQL Repository
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12" BACKREST_VERSION="2.20"
 
 RUN yum -y install \
-	--disablerepo="${PGDG_REPO_DISABLE}" \
-	--enablerepo="${PGDG_REPO_ENABLE}" \
+    --setopt=skip_missing_names_on_install=False \
     hostname \
     openssh-clients \
     openssh-server \
-    pgbackrest-"${BACKREST_VERSION}" \
+    crunchy-backrest-"${BACKREST_VERSION}" \
     procps-ng \
     psmisc \
     rsync \

centos7/Dockerfile.pgo-backrest-restore.centos7

@@ -7,17 +7,13 @@ LABEL name="pgo-backrest-restore" \
 	summary="Crunchy PostgreSQL Operator - pgBackRest Restore" \
 	description="Performs a restore operation for a PostgreSQL database using pgBackRest."
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg*" PGDG_REPO_ENABLE="pgdg12" \
-    BACKREST_VERSION="2.20"
-
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12" BACKREST_VERSION="2.20"
 
 RUN yum -y install \
-	--disablerepo="${PGDG_REPO_DISABLE}" \
-	--enablerepo="${PGDG_REPO_ENABLE}" \
+    --setopt=skip_missing_names_on_install=False \
     openssh-clients \
     openssh-server \
-    pgbackrest-"${BACKREST_VERSION}" \
+    crunchy-backrest-"${BACKREST_VERSION}" \
     postgresql12-server \
     procps-ng \
     psmisc \

centos7/Dockerfile.pgo-backrest.centos7

@@ -7,17 +7,12 @@ LABEL name="pgo-backrest" \
 	summary="Crunchy PostgreSQL Operator - pgBackRest" \
 	description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg*" PGDG_REPO_ENABLE="pgdg12" \
-    BACKREST_VERSION="2.20"
-
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12" BACKREST_VERSION="2.20"
 
 RUN yum -y install \
-    --disablerepo="${PGDG_REPO_DISABLE}" \
-    --enablerepo="${PGDG_REPO_ENABLE}" \
     --setopt=skip_missing_names_on_install=False \
     postgresql12-server \
-    pgbackrest-"${BACKREST_VERSION}" \
+    crunchy-backrest-"${BACKREST_VERSION}" \
     && yum -y clean all
 
 RUN mkdir -p /opt/cpm/bin /pgdata /backrestrepo && chown -R 26:26 /opt/cpm

centos7/Dockerfile.pgo-base.centos7

@@ -18,3 +18,8 @@ COPY redhat/licenses /licenses
 COPY licenses /licenses
 
 RUN yum -y update && yum -y clean all
+
+# Crunchy PostgreSQL repository
+ADD conf/RPM-GPG-KEY-crunchydata  /
+ADD conf/crunchypg12.repo /etc/yum.repos.d/
+RUN rpm --import RPM-GPG-KEY-crunchydata

centos7/Dockerfile.pgo-load.centos7

@@ -7,13 +7,11 @@ LABEL name="pgo-load" \
 	summary="Crunchy PostgreSQL Operator - Load Data" \
 	description="Loads a CSV or JSON file into the database."
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
-
-# PGDG PostgreSQL Repository
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12"
 
 RUN yum -y install epel-release \
     && yum install -y \
+        --setopt=skip_missing_names_on_install=False \
         gettext \
         hostname \
         nss_wrapper \

centos7/Dockerfile.pgo-scheduler.centos7

@@ -9,6 +9,7 @@ LABEL name="pgo-scheduler" \
 
 RUN yum -y install epel-release \
 	&& yum -y install \
+                --setopt=skip_missing_names_on_install=False \
 		gettext \
 		hostname  \
 		nss_wrapper \

centos7/Dockerfile.pgo-sqlrunner.centos7

@@ -7,14 +7,13 @@ LABEL name="pgo-sqlrunner" \
 	summary="Crunchy PostgreSQL Operator - SQL Runner" \
 	description="Crunchy PostgreSQL Operator - SQL Runner"
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
+ENV PGVERSION="12"
 
 ENV PGROOT="/usr/pgsql-${PGVERSION}"
 
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
-
 RUN yum -y install epel-release \
 	&& yum -y install \
+                --setopt=skip_missing_names_on_install=False \
 		gettext \
 		hostname  \
 		nss_wrapper \

centos7/Dockerfile.postgres-operator.centos7

@@ -7,10 +7,7 @@ LABEL name="postgres-operator" \
 	summary="Crunchy PostgreSQL Operator" \
 	description="Crunchy PostgreSQL Operator"
 
-ENV PGVERSION="12" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
-
-# PGDG PostgreSQL Repository
-RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
+ENV PGVERSION="12"
 
 RUN yum -y install hostname postgresql12  && yum -y clean all