Merge pull request CrunchyData#306 from cahoonpwork/pre32

jmccormick2001 · web-flow · commit 8f8c1348f1d8 · 2018-08-15T08:34:24.000-05:00
updated Postgres version and removed build-date as is it not required anymore.
diff --git a/centos7/Dockerfile.pgo-apiserver.centos7 b/centos7/Dockerfile.pgo-apiserver.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
 	summary="crunchy data's postgres operator api" \
diff --git a/centos7/Dockerfile.pgo-load.centos7 b/centos7/Dockerfile.pgo-load.centos7
@@ -3,10 +3,9 @@ FROM centos:7
 LABEL name="crunchydata/pgo-load" \
     vendor="crunchy data" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
-	build-date="2018-08-02" \
     url="https://crunchydata.com" \
     summary="loads a CSV or json file into a database" \
     description="executed by the operator, loads a CSV or json file." \
diff --git a/centos7/Dockerfile.postgres-operator.centos7 b/centos7/Dockerfile.postgres-operator.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL  Vendor="Crunchy Data Solutions" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
 	summary="crunchy data's postgres operator" \
diff --git a/hugo/content/installation/configuration.adoc b/hugo/content/installation/configuration.adoc
@@ -225,7 +225,7 @@ looks like this -
 ....
 BasicAuth:  true
 Cluster:
-  CCPImageTag:  centos7-10.4-2.1.0
+  CCPImageTag:  centos7-10.5-2.1.0
   Metrics:  false
   Badger:  false
   Port:  5432
diff --git a/rhel7/Dockerfile.pgo-apiserver.rhel7 b/rhel7/Dockerfile.pgo-apiserver.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="pgo-apiserver-" \
 	vendor="crunchydata.com" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
 	run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.pgo-load.rhel7 b/rhel7/Dockerfile.pgo-load.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="crunchydata/pgo-load-" \
     vendor="crunchydata.com" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
     run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="postgres-operator" \
 	vendor="crunchydata.com" \
 	PostgresVersion="10" \
-	PostgresFullVersion="10.4" \
+	PostgresFullVersion="10.5" \
 	Version="7.5" \
 	Release="3.2.0" \
 	run='docker run -d -p 8080:80 --name=web-app web-app' \
