Skip to content

Commit

Permalink
automated script version updates and minor format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cahoonpwork committed Aug 21, 2018
1 parent 8224fe5 commit ee63d01
Show file tree
Hide file tree
Showing 31 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion bin/pull.sh
Expand Up @@ -15,7 +15,7 @@

P_IMAGE_PREFIX=registry-dev.crunchydata.com/crunchydata
CO_IMAGE_PREFIX=crunchydata
CO_IMAGE_TAG=centos7-3.1
CO_IMAGE_TAG=centos7-3.2.0

for CNAME in pgo-rmdata pgo-load pgo-lspvc postgres-operator pgo-apiserver
do
Expand Down
12 changes: 6 additions & 6 deletions centos7/Dockerfile.pgo-apiserver.centos7
@@ -1,12 +1,12 @@
FROM centos:7

LABEL Vendor="Crunchy Data Solutions" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
description="Crunchy Data PostgreSQL Operator - Apiserver"
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
description="Crunchy Data PostgreSQL Operator - Apiserver"

ENV PGVERSION="10" PGDG_REPO="pgdg-centos10-10-2.noarch.rpm"

Expand Down
12 changes: 6 additions & 6 deletions centos7/Dockerfile.pgo-backrest.centos7
@@ -1,12 +1,12 @@
FROM centos:7

LABEL Vendor="Crunchy Data Solutions" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."

RUN yum -y update && yum -y clean all

Expand Down
8 changes: 4 additions & 4 deletions centos7/Dockerfile.pgo-load.centos7
Expand Up @@ -2,10 +2,10 @@ FROM centos:7

LABEL name="crunchydata/pgo-load" \
vendor="crunchy data" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
url="https://crunchydata.com" \
summary="Crunchy Data PostgreSQL Operator - Load Data" \
description="Loads a CSV or JSON file into the database." \
Expand Down
8 changes: 4 additions & 4 deletions centos7/Dockerfile.pgo-lspvc.centos7
@@ -1,10 +1,10 @@
FROM centos:7

LABEL Vendor="Crunchy Data Solutions" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Display PVC" \
description="Crunchy Data PostgreSQL Operator - Display contents of a PVC"
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Display PVC" \
description="Crunchy Data PostgreSQL Operator - Display contents of a PVC"

RUN yum -y update && yum -y clean all

Expand Down
8 changes: 4 additions & 4 deletions centos7/Dockerfile.pgo-rmdata.centos7
@@ -1,10 +1,10 @@
FROM centos:7

LABEL Vendor="Crunchy Data Solutions" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Remove Data" \
description="Crunchy Data PostgreSQL Operator - Remove Data"
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator - Remove Data" \
description="Crunchy Data PostgreSQL Operator - Remove Data"

RUN yum -y update && yum -y clean all

Expand Down
12 changes: 6 additions & 6 deletions centos7/Dockerfile.postgres-operator.centos7
@@ -1,12 +1,12 @@
FROM centos:7

LABEL Vendor="Crunchy Data Solutions" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator" \
description="Crunchy Data PostgreSQL Operator"
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
summary="Crunchy Data PostgreSQL Operator" \
description="Crunchy Data PostgreSQL Operator"

ENV PGVERSION="10" PGDG_REPO="pgdg-centos10-10-2.noarch.rpm"

Expand Down
2 changes: 1 addition & 1 deletion examples/pgo.yaml.emptydir
Expand Up @@ -25,4 +25,4 @@ Pgo:
LSPVCTemplate: /config/pgo.lspvc-template.json
LoadTemplate: /config/pgo.load-template.json
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
2 changes: 1 addition & 1 deletion examples/pgo.yaml.hostpath
Expand Up @@ -22,4 +22,4 @@ Pgo:
LSPVCTemplate: /config/pgo.lspvc-template.json
LoadTemplate: /config/pgo.load-template.json
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
2 changes: 1 addition & 1 deletion examples/pgo.yaml.nfs
Expand Up @@ -25,4 +25,4 @@ Pgo:
LSPVCTemplate: /config/pgo.lspvc-template.json
LoadTemplate: /config/pgo.load-template.json
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
2 changes: 1 addition & 1 deletion examples/pgo.yaml.storageclass
Expand Up @@ -26,4 +26,4 @@ Pgo:
LSPVCTemplate: /config/pgo.lspvc-template.json
LoadTemplate: /config/pgo.load-template.json
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
2 changes: 1 addition & 1 deletion examples/sample-json-load-config.yaml
@@ -1,5 +1,5 @@
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
DbDatabase: userdb
DbUser: postgres
DbPort: 5432
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-load-config.yaml
@@ -1,5 +1,5 @@
COImagePrefix: crunchydata
COImageTag: centos7-3.1
COImageTag: centos7-3.2.0
DbDatabase: userdb
DbUser: postgres
DbPort: 5432
Expand Down
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_apiserver/help.1
Expand Up @@ -52,4 +52,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_apiserver/help.md
Expand Up @@ -35,4 +35,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_backrest/help.1
Expand Up @@ -49,4 +49,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_backrest/help.md
Expand Up @@ -32,4 +32,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_load/help.1
Expand Up @@ -50,4 +50,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_load/help.md
Expand Up @@ -33,4 +33,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_lspvc/help.1
Expand Up @@ -49,4 +49,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_lspvc/help.md
Expand Up @@ -32,4 +32,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_rmdata/help.1
Expand Up @@ -49,4 +49,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/pgo_rmdata/help.md
Expand Up @@ -32,4 +32,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/postgres_operator/help.1
Expand Up @@ -50,4 +50,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
2 changes: 1 addition & 1 deletion redhat/atomic/postgres_operator/help.md
Expand Up @@ -33,4 +33,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="3.2"
The specific release number of the container. For example, Release="3.2.0"
16 changes: 8 additions & 8 deletions rhel7/Dockerfile.pgo-apiserver.rhel7
Expand Up @@ -3,14 +3,14 @@ FROM registry.access.redhat.com/rhel7
MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="pgo-apiserver-" \
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
description="Crunchy Data PostgreSQL Operator - Apiserver"
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
description="Crunchy Data PostgreSQL Operator - Apiserver"

ENV PGVERSION="10"

Expand Down
8 changes: 4 additions & 4 deletions rhel7/Dockerfile.pgo-backrest.rhel7
Expand Up @@ -4,10 +4,10 @@ MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="crunchydata/pgo-backrest-" \
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."
Expand Down
8 changes: 4 additions & 4 deletions rhel7/Dockerfile.pgo-load.rhel7
Expand Up @@ -4,10 +4,10 @@ MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="crunchydata/pgo-load-" \
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - Load Data" \
description="Loads a CSV or JSON file into the database."
Expand Down
4 changes: 2 additions & 2 deletions rhel7/Dockerfile.pgo-lspvc.rhel7
Expand Up @@ -4,8 +4,8 @@ MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="pgo-lspvc" \
vendor="crunchydata.com" \
Version="7.5" \
Release="3.2.0" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - Display PVC" \
description="Crunchy Data PostgreSQL Operator - Display contents of a PVC"
Expand Down
4 changes: 2 additions & 2 deletions rhel7/Dockerfile.pgo-rmdata.rhel7
Expand Up @@ -4,8 +4,8 @@ MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="pgo-rmdata" \
vendor="crunchydata.com" \
Version="7.5" \
Release="3.2.0" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator - Remove Data" \
description="Crunchy Data PostgreSQL Operator - Remove Data"
Expand Down
16 changes: 8 additions & 8 deletions rhel7/Dockerfile.postgres-operator.rhel7
Expand Up @@ -3,14 +3,14 @@ FROM registry.access.redhat.com/rhel7
MAINTAINER jeff.mccormick@crunchydata.com

LABEL name="postgres-operator" \
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator" \
description="Crunchy Data PostgreSQL Operator"
vendor="crunchydata.com" \
PostgresVersion="10" \
PostgresFullVersion="10.5" \
Version="7.5" \
Release="3.2.0" \
run='docker run -d -p 8080:80 --name=web-app web-app' \
summary="Crunchy Data PostgreSQL Operator" \
description="Crunchy Data PostgreSQL Operator"

ENV PGVERSION="10"

Expand Down

0 comments on commit ee63d01

Please sign in to comment.