fix dockerfiles to specify pg10, also change the Makefile setup targe…

…t to not install rbac rules, create new makefile target called installrbac for that purpose

Makefile

@@ -43,9 +43,10 @@ gendeps:
 	github.com/crunchydata/postgres-operator/apiserver/userservice \
 	github.com/crunchydata/postgres-operator/apiserver/util \
 	github.com/crunchydata/postgres-operator/apiserver/versionservice 
+installrbac:
+	cd deploy && ./install-rbac.sh
 setup:
 	./bin/get-deps.sh
-	cd deploy && ./install-rbac.sh
 	cd examples/backrest-config && ./create.sh
 setupnamespace:
 	kubectl create -f ./examples/demo-namespace.json

rhel7/Dockerfile.pgo-apiserver.rhel7

@@ -21,7 +21,7 @@ COPY redhat/licenses /licenses
 # Crunchy PostgreSQL repository
 
 ADD conf/CRUNCHY-GPG-KEY.public  /
-ADD conf/crunchypg96.repo /etc/yum.repos.d/
+ADD conf/crunchypg10.repo /etc/yum.repos.d/
 RUN rpm --import CRUNCHY-GPG-KEY.public
 
 RUN yum -y update && yum -y install postgresql${PGVERSION} hostname && yum -y clean all

rhel7/Dockerfile.pgo-load.rhel7

@@ -21,7 +21,7 @@ COPY redhat/licenses /licenses
 # Crunchy PostgreSQL repository
 
 ADD conf/CRUNCHY-GPG-KEY.public  /
-ADD conf/crunchypg96.repo /etc/yum.repos.d/
+ADD conf/crunchypg10.repo /etc/yum.repos.d/
 RUN rpm --import CRUNCHY-GPG-KEY.public
 
 RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

rhel7/Dockerfile.postgres-operator.rhel7

@@ -21,7 +21,7 @@ COPY redhat/licenses /licenses
 # Crunchy PostgreSQL repository
 
 ADD conf/CRUNCHY-GPG-KEY.public  /
-ADD conf/crunchypg96.repo /etc/yum.repos.d/
+ADD conf/crunchypg10.repo /etc/yum.repos.d/
 RUN rpm --import CRUNCHY-GPG-KEY.public
 
 RUN yum -y update && yum -y install postgresql${PGVERSION} && yum -y clean all