From e537ab96bb95d5eb4aa63662bc225ef79254b748 Mon Sep 17 00:00:00 2001 From: Paul Cahoon Date: Wed, 15 Aug 2018 08:07:23 -0400 Subject: [PATCH] updated Postgres and removed build-date as is it not required anymore. Please enter the commit message for your changes. Lines starting --- centos7/Dockerfile.pgo-apiserver.centos7 | 2 +- centos7/Dockerfile.pgo-load.centos7 | 3 +-- centos7/Dockerfile.postgres-operator.centos7 | 2 +- hugo/content/installation/configuration.adoc | 2 +- rhel7/Dockerfile.pgo-apiserver.rhel7 | 2 +- rhel7/Dockerfile.pgo-load.rhel7 | 2 +- rhel7/Dockerfile.postgres-operator.rhel7 | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/centos7/Dockerfile.pgo-apiserver.centos7 b/centos7/Dockerfile.pgo-apiserver.centos7 index 45eae6f4fe..5ba4a2ea0f 100644 --- 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 index 425ea1cc38..e3c14abb57 100644 --- 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 index cc7a32ea5c..6cf48c8bdd 100644 --- 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 index e87bdce7a7..846925ec29 100644 --- 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 index 02414ba416..8ed2c8887b 100644 --- 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 index 5009dc2f3e..e0c072df0f 100644 --- 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 index 13492bfd8c..bfd1327e3a 100644 --- 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' \