Hlord update backport (#756)

crunchyheath · cahoonpwork · commit b6bd4662707b · 2019-05-13T15:55:42.000-04:00
* Backporting yum update changes to 3.5.2

* Adding back the inclusion of crunchy pg11 repo
diff --git a/rhel7/Dockerfile.pgo-apiserver.rhel7 b/rhel7/Dockerfile.pgo-apiserver.rhel7
@@ -24,7 +24,9 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && yum -y install postgresql${PGVERSION} hostname && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y install postgresql${PGVERSION} hostname \
+ && yum -y clean all
 
 ADD bin/apiserver /usr/local/bin
 ADD bin/postgres-operator/runpsql.sh /usr/local/bin
diff --git a/rhel7/Dockerfile.pgo-backrest-repo.rhel7 b/rhel7/Dockerfile.pgo-backrest-repo.rhel7
@@ -20,7 +20,7 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update && \
 yum -y install psmisc openssh-server openssh-clients crunchy-backrest-"${BACKREST_VERSION}" hostname pgocps-ng && \
 yum -y clean all
 
diff --git a/rhel7/Dockerfile.pgo-backrest-restore.rhel7 b/rhel7/Dockerfile.pgo-backrest-restore.rhel7
@@ -20,7 +20,9 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && yum -y install psmisc openssh-server openssh-clients crunchy-backrest-"${BACKREST_VERSION}" postgresql11-server procps-ng && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y install psmisc openssh-server openssh-clients crunchy-backrest-"${BACKREST_VERSION}" postgresql11-server procps-ng \
+ && yum -y clean all
 
 VOLUME ["/sshd", "/pgdata"]
 
diff --git a/rhel7/Dockerfile.pgo-backrest.rhel7 b/rhel7/Dockerfile.pgo-backrest.rhel7
@@ -23,7 +23,10 @@ COPY redhat/atomic/pgo_backrest/help.1 /help.1
 COPY redhat/atomic/pgo_backrest/help.md /help.md
 COPY redhat/licenses /licenses
 
-RUN yum -y update && yum -y install postgresql11-server && yum -y install crunchy-backrest-"${BACKREST_VERSION}" && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y install postgresql11-server \
+ && yum -y install crunchy-backrest-"${BACKREST_VERSION}" \
+ && yum -y clean all
 
 #RUN mkdir -p /opt/cpm/bin /pgdata /backrestrepo && chown -R 26:26 /opt/cpm && chmod -R g=u /pgdata 
 RUN mkdir -p /opt/cpm/bin /pgdata /backrestrepo && chown -R 26:26 /opt/cpm 
diff --git a/rhel7/Dockerfile.pgo-load.rhel7 b/rhel7/Dockerfile.pgo-load.rhel7
@@ -24,7 +24,8 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && yum install -y \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum install -y \
 	gettext \
 	hostname \
 	procps-ng \
diff --git a/rhel7/Dockerfile.pgo-lspvc.rhel7 b/rhel7/Dockerfile.pgo-lspvc.rhel7
@@ -19,7 +19,8 @@ ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
 
-RUN yum -y update && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y clean all
 
 #RUN mkdir -p /opt/cpm/bin && chown -R 26:26 /opt/cpm
 #RUN mkdir /pgdata && chmod -R g=u /pgdata
diff --git a/rhel7/Dockerfile.pgo-rmdata.rhel7 b/rhel7/Dockerfile.pgo-rmdata.rhel7
@@ -19,7 +19,8 @@ ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
 
-RUN yum -y update && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y clean all
 
 RUN mkdir -p /opt/cpm/bin
 ADD bin/pgo-rmdata/ /opt/cpm/bin
diff --git a/rhel7/Dockerfile.pgo-scheduler.rhel7 b/rhel7/Dockerfile.pgo-scheduler.rhel7
@@ -16,7 +16,8 @@ COPY redhat/atomic/pgo_scheduler/help.1 /help.1
 COPY redhat/atomic/pgo_scheduler/help.md /help.md
 COPY redhat/licenses /licenses
 
-RUN yum -y update && yum clean all -y
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum clean all -y
 
 RUN mkdir -p /opt/cpm/bin /opt/cpm/conf /pgo-config \
  && chown -R 2:2 /opt/cpm /pgo-config
diff --git a/rhel7/Dockerfile.pgo-sqlrunner.rhel7 b/rhel7/Dockerfile.pgo-sqlrunner.rhel7
@@ -20,7 +20,9 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && yum -y install postgresql${PGVERSION} && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y install postgresql${PGVERSION} \
+ && yum -y clean all
 
 RUN mkdir -p /opt/cpm/bin /opt/cpm/conf /pgconf \
  && chown -R 26:26 /opt/cpm /pgconf
diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7
@@ -24,7 +24,9 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y update && yum -y install postgresql${PGVERSION} && yum -y clean all
+RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+ && yum -y install postgresql${PGVERSION} \
+ && yum -y clean all
 
 ADD bin/postgres-operator /usr/local/bin
 
