From 0d94819327d6adc0035c37e878a59b544c79255b Mon Sep 17 00:00:00 2001 From: Sarah Conway Date: Sat, 18 Aug 2018 07:21:02 -0700 Subject: [PATCH] issue #309 #310 add Atomic documentation & licensing for Docker images --- centos7/Dockerfile.pgo-apiserver.centos7 | 16 +++--- centos7/Dockerfile.pgo-backrest.centos7 | 7 ++- centos7/Dockerfile.pgo-load.centos7 | 19 +++---- centos7/Dockerfile.pgo-lspvc.centos7 | 8 +-- centos7/Dockerfile.pgo-rmdata.centos7 | 8 +-- centos7/Dockerfile.postgres-operator.centos7 | 16 +++--- redhat/atomic/pgo_apiserver/help.1 | 55 ++++++++++++++++++++ redhat/atomic/pgo_apiserver/help.md | 38 ++++++++++++++ redhat/atomic/pgo_load/help.1 | 53 +++++++++++++++++++ redhat/atomic/pgo_load/help.md | 36 +++++++++++++ redhat/atomic/pgo_lspvc/help.1 | 52 ++++++++++++++++++ redhat/atomic/pgo_lspvc/help.md | 35 +++++++++++++ redhat/atomic/pgo_rmdata/help.1 | 52 ++++++++++++++++++ redhat/atomic/pgo_rmdata/help.md | 35 +++++++++++++ redhat/atomic/postgres_operator/help.1 | 53 +++++++++++++++++++ redhat/atomic/postgres_operator/help.md | 36 +++++++++++++ licenses => redhat/licenses/LICENSE.txt | 0 rhel7/Dockerfile.pgo-apiserver.rhel7 | 26 ++++----- rhel7/Dockerfile.pgo-load.rhel7 | 25 +++++---- rhel7/Dockerfile.pgo-lspvc.rhel7 | 20 ++++--- rhel7/Dockerfile.pgo-rmdata.rhel7 | 19 +++---- rhel7/Dockerfile.postgres-operator.rhel7 | 25 +++++---- 22 files changed, 544 insertions(+), 90 deletions(-) create mode 100644 redhat/atomic/pgo_apiserver/help.1 create mode 100644 redhat/atomic/pgo_apiserver/help.md create mode 100644 redhat/atomic/pgo_load/help.1 create mode 100644 redhat/atomic/pgo_load/help.md create mode 100644 redhat/atomic/pgo_lspvc/help.1 create mode 100644 redhat/atomic/pgo_lspvc/help.md create mode 100644 redhat/atomic/pgo_rmdata/help.1 create mode 100644 redhat/atomic/pgo_rmdata/help.md create mode 100644 redhat/atomic/postgres_operator/help.1 create mode 100644 redhat/atomic/postgres_operator/help.md rename licenses => redhat/licenses/LICENSE.txt (100%) diff --git a/centos7/Dockerfile.pgo-apiserver.centos7 b/centos7/Dockerfile.pgo-apiserver.centos7 index 5ba4a2ea0f..8a60d161ad 100644 --- a/centos7/Dockerfile.pgo-apiserver.centos7 +++ b/centos7/Dockerfile.pgo-apiserver.centos7 @@ -1,18 +1,18 @@ FROM centos:7 LABEL Vendor="Crunchy Data Solutions" \ - PostgresVersion="10" \ - PostgresFullVersion="10.5" \ - Version="7.5" \ - Release="3.2.0" \ - summary="crunchy data's postgres operator api" \ - description="crunchy data postgres operator api" - + 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" -RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO} +# PGDG PostgreSQL Repository +RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO} RUN yum -y update && yum -y install postgresql96 hostname && yum -y clean all diff --git a/centos7/Dockerfile.pgo-backrest.centos7 b/centos7/Dockerfile.pgo-backrest.centos7 index 3ae2bb4c16..98629f5e91 100644 --- a/centos7/Dockerfile.pgo-backrest.centos7 +++ b/centos7/Dockerfile.pgo-backrest.centos7 @@ -1,13 +1,12 @@ FROM centos:7 LABEL Vendor="Crunchy Data Solutions" \ - Release="3.2.0" \ - summary="crunchy data's postgres operator backrest" \ - description="crunchy data postgres operator backrest" + 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 - RUN mkdir -p /opt/cpm/bin && chown -R 26:26 /opt/cpm ADD bin/pgo-backrest/ /opt/cpm/bin diff --git a/centos7/Dockerfile.pgo-load.centos7 b/centos7/Dockerfile.pgo-load.centos7 index e3c14abb57..6a3c4f7af4 100644 --- a/centos7/Dockerfile.pgo-load.centos7 +++ b/centos7/Dockerfile.pgo-load.centos7 @@ -2,13 +2,13 @@ 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="loads a CSV or json file into a database" \ - description="executed by the operator, loads a CSV or json file." \ + summary="Crunchy Data PostgreSQL Operator - Load Data" \ + description="Loads a CSV or JSON file into the database." \ io.k8s.description="pgo-load container" \ io.k8s.display-name="Crunchy pgo-load container" \ io.openshift.expose-services="" \ @@ -16,7 +16,8 @@ LABEL name="crunchydata/pgo-load" \ ENV PGVERSION="10" PGDG_REPO="pgdg-centos10-10-2.noarch.rpm" -# PGDG Postgres repo +# PGDG PostgreSQL Repository + RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO} RUN yum -y update && yum -y install epel-release \ @@ -29,10 +30,10 @@ RUN yum -y update && yum -y install epel-release \ && yum -y install postgresql10 \ && yum clean all -y -RUN mkdir -p /opt/cpm/bin /opt/cpm/conf +RUN mkdir -p /opt/cpm/bin /opt/cpm/conf ADD bin/pgo-load/ /opt/cpm/bin ADD conf/pgo-load/ /opt/cpm/conf -RUN chown -R 26:26 /opt/cpm +RUN chown -R 26:26 /opt/cpm VOLUME /pgdata diff --git a/centos7/Dockerfile.pgo-lspvc.centos7 b/centos7/Dockerfile.pgo-lspvc.centos7 index a8ad248881..c1f3524393 100644 --- a/centos7/Dockerfile.pgo-lspvc.centos7 +++ b/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's postgres operator lspvc" \ - description="crunchy data postgres operator lspvc" + 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 diff --git a/centos7/Dockerfile.pgo-rmdata.centos7 b/centos7/Dockerfile.pgo-rmdata.centos7 index ccda3c8c29..bdfad68d10 100644 --- a/centos7/Dockerfile.pgo-rmdata.centos7 +++ b/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's postgres operator rmdata" \ - description="crunchy data postgres operator rmdata" + 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 diff --git a/centos7/Dockerfile.postgres-operator.centos7 b/centos7/Dockerfile.postgres-operator.centos7 index 6cf48c8bdd..85a9a5fb49 100644 --- a/centos7/Dockerfile.postgres-operator.centos7 +++ b/centos7/Dockerfile.postgres-operator.centos7 @@ -1,15 +1,17 @@ FROM centos:7 LABEL Vendor="Crunchy Data Solutions" \ - PostgresVersion="10" \ - PostgresFullVersion="10.5" \ - Version="7.5" \ - Release="3.2.0" \ - summary="crunchy data's postgres operator" \ - description="postgres 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" +# PGDG PostgreSQL Repository + RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO} RUN yum -y update && yum -y install hostname postgresql96 && yum -y clean all diff --git a/redhat/atomic/pgo_apiserver/help.1 b/redhat/atomic/pgo_apiserver/help.1 new file mode 100644 index 0000000000..9ecab6deee --- /dev/null +++ b/redhat/atomic/pgo_apiserver/help.1 @@ -0,0 +1,55 @@ +.TH "pgo-apiserver " "1" " Container Image Pages" "Jeff McCormick" "August 17, 2018" +.nh +.ad l + + +.SH NAME +.PP +pgo-apiserver \- pgo-apiserver container image + + +.SH DESCRIPTION +.PP +The Postgres Operator is a controller, written in Golang, that uses the Kubernetes API and CustomResourceDefinition concepts to offer users a CLI which enables them to create and manage PostgreSQL databases and clusters running on a Kubernetes cluster. + +The apiserver REST API allows users to interact freely with the Operator using a command line interface. + +.PP +The container itself consists of: + \- RHEL7 base image + \- Bash script that performs the container startup + \- PostgreSQL binary packages + +.PP +Files added to the container during Docker build include: /help.1. + + +.SH USAGE +.PP +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + + +.SH LABELS +.PP +The starter container includes the following LABEL settings: + +.PP +That atomic command runs the Docker command set in this label: + +.PP +\fB\fCName=\fR + +.PP +The registry location and name of the image. For example, Name="crunchydata/pgo-apiserver". + +.PP +\fB\fCVersion=\fR + +.PP +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +.PP +\fB\fCRelease=\fR + +.PP +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_apiserver/help.md b/redhat/atomic/pgo_apiserver/help.md new file mode 100644 index 0000000000..4b21980faf --- /dev/null +++ b/redhat/atomic/pgo_apiserver/help.md @@ -0,0 +1,38 @@ += pgo-apiserver (1) +Jeff McCormick +August 17, 2018 + +== NAME +pgo-apiserver - The REST API container image for Crunchy Data's PostgreSQL Operator + +== DESCRIPTION +The Postgres Operator is a controller, written in Golang, that uses the Kubernetes API and CustomResourceDefinition concepts to offer users a CLI which enables them to create and manage PostgreSQL databases and clusters running on a Kubernetes cluster. + +The apiserver REST API allows users to interact freely with the Operator using a command line interface. + +The container itself consists of: + - RHEL7 base image + - Bash script that performs the container startup + - PostgreSQL binary packages + +Files added to the container during Docker build include: /help.1. + +== USAGE +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + +== LABELS +The starter container includes the following LABEL settings: + +That atomic command runs the Docker command set in this label: + +`Name=` + +The registry location and name of the image. For example, Name="crunchydata/pgo-apiserver". + +`Version=` + +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +`Release=` + +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_load/help.1 b/redhat/atomic/pgo_load/help.1 new file mode 100644 index 0000000000..59792f1223 --- /dev/null +++ b/redhat/atomic/pgo_load/help.1 @@ -0,0 +1,53 @@ +.TH "pgo-load " "1" " Container Image Pages" "Jeff McCormick" "August 17, 2018" +.nh +.ad l + + +.SH NAME +.PP +pgo-load \- Loads a CSV or JSON file into a PostgreSQL database. + + +.SH DESCRIPTION +.PP +Works in conjunction with Crunchy Data's PostgreSQL Operator to load a CSV or JSON file into the database. + +.PP +The container itself consists of: + \- RHEL7 base image + \- Bash script that performs the container startup + \- PostgreSQL binary packages + +.PP +Files added to the container during Docker build include: /help.1. + + +.SH USAGE +.PP +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + + +.SH LABELS +.PP +The starter container includes the following LABEL settings: + +.PP +That atomic command runs the Docker command set in this label: + +.PP +\fB\fCName=\fR + +.PP +The registry location and name of the image. For example, Name="crunchydata/pgo-load". + +.PP +\fB\fCVersion=\fR + +.PP +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +.PP +\fB\fCRelease=\fR + +.PP +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_load/help.md b/redhat/atomic/pgo_load/help.md new file mode 100644 index 0000000000..79ba68be88 --- /dev/null +++ b/redhat/atomic/pgo_load/help.md @@ -0,0 +1,36 @@ += pgo-load (1) +Jeff McCormick +August 17, 2018 + +== NAME +pgo-load - Loads a CSV or JSON file into a PostgreSQL database. + +== DESCRIPTION +Works in conjunction with Crunchy Data's PostgreSQL Operator to load a CSV or JSON file into the database. + +The container itself consists of: + - RHEL7 base image + - Bash script that performs the container startup + - PostgreSQL binary packages + +Files added to the container during Docker build include: /help.1. + +== USAGE +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + +== LABELS +The starter container includes the following LABEL settings: + +That atomic command runs the Docker command set in this label: + +`Name=` + +The registry location and name of the image. For example, Name="crunchydata/pgo-load". + +`Version=` + +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +`Release=` + +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_lspvc/help.1 b/redhat/atomic/pgo_lspvc/help.1 new file mode 100644 index 0000000000..a73486fcc7 --- /dev/null +++ b/redhat/atomic/pgo_lspvc/help.1 @@ -0,0 +1,52 @@ +.TH "pgo-lspvc " "1" " Container Image Pages" "Jeff McCormick" "August 17, 2018" +.nh +.ad l + + +.SH NAME +.PP +pgo-lspvc \- Display contents of a PVC. + + +.SH DESCRIPTION +.PP +The pgo-lspvc image works in conjunction with Crunchy Data's PostgreSQL Operator to display the contents of a PVC using the ls command. + +.PP +The container itself consists of: + \- RHEL7 base image + \- Command executing ls against the target container + +.PP +Files added to the container during Docker build include: /help.1. + + +.SH USAGE +.PP +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + + +.SH LABELS +.PP +The starter container includes the following LABEL settings: + +.PP +That atomic command runs the Docker command set in this label: + +.PP +\fB\fCName=\fR + +.PP +The registry location and name of the image. For example, Name="crunchydata/pgo-lspvc". + +.PP +\fB\fCVersion=\fR + +.PP +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +.PP +\fB\fCRelease=\fR + +.PP +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_lspvc/help.md b/redhat/atomic/pgo_lspvc/help.md new file mode 100644 index 0000000000..a1ac686cb7 --- /dev/null +++ b/redhat/atomic/pgo_lspvc/help.md @@ -0,0 +1,35 @@ += pgo-lspvc (1) +Jeff McCormick +August 17, 2018 + +== NAME +pgo-lspvc - Display contents of a PVC. + +== DESCRIPTION +The pgo-lspvc image works in conjunction with Crunchy Data's PostgreSQL Operator to display the contents of a PVC using the ls command. + +The container itself consists of: + - RHEL7 base image + - Command executing ls command against the target container + +Files added to the container during Docker build include: /help.1. + +== USAGE +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + +== LABELS +The starter container includes the following LABEL settings: + +That atomic command runs the Docker command set in this label: + +`Name=` + +The registry location and name of the image. For example, Name="crunchydata/pgo-lspvc". + +`Version=` + +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +`Release=` + +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_rmdata/help.1 b/redhat/atomic/pgo_rmdata/help.1 new file mode 100644 index 0000000000..c73d0e35de --- /dev/null +++ b/redhat/atomic/pgo_rmdata/help.1 @@ -0,0 +1,52 @@ +.TH "pgo-rmdata " "1" " Container Image Pages" "Jeff McCormick" "August 17, 2018" +.nh +.ad l + + +.SH NAME +.PP +pgo-rmdata \- Removes the contents of the PostgreSQL data directory. + + +.SH DESCRIPTION +.PP +The pgo-rmdata image works in conjunction with Crunchy Data's PostgreSQL Operator to remove the contents of the PostgreSQL data directory. + +.PP +The container itself consists of: + \- RHEL7 base image + \- Command that executes the forced recursive removal of data in the PGDATA directory + +.PP +Files added to the container during Docker build include: /help.1. + + +.SH USAGE +.PP +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + + +.SH LABELS +.PP +The starter container includes the following LABEL settings: + +.PP +That atomic command runs the Docker command set in this label: + +.PP +\fB\fCName=\fR + +.PP +The registry location and name of the image. For example, Name="crunchydata/pgo-rmdata". + +.PP +\fB\fCVersion=\fR + +.PP +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +.PP +\fB\fCRelease=\fR + +.PP +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/pgo_rmdata/help.md b/redhat/atomic/pgo_rmdata/help.md new file mode 100644 index 0000000000..03b097a45e --- /dev/null +++ b/redhat/atomic/pgo_rmdata/help.md @@ -0,0 +1,35 @@ += pgo-rmdata (1) +Jeff McCormick +August 17, 2018 + +== NAME +pgo-rmdata - Removes the contents of the PostgreSQL data directory. + +== DESCRIPTION +The pgo-rmdata image works in conjunction with Crunchy Data's PostgreSQL Operator to remove the contents of the PostgreSQL data directory. + +The container itself consists of: + - RHEL7 base image + - Command that executes the forced recursive removal of data in the PGDATA directory + +Files added to the container during Docker build include: /help.1. + +== USAGE +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + +== LABELS +The starter container includes the following LABEL settings: + +That atomic command runs the Docker command set in this label: + +`Name=` + +The registry location and name of the image. For example, Name="crunchydata/pgo-rmdata". + +`Version=` + +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +`Release=` + +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/postgres_operator/help.1 b/redhat/atomic/postgres_operator/help.1 new file mode 100644 index 0000000000..597345b7e1 --- /dev/null +++ b/redhat/atomic/postgres_operator/help.1 @@ -0,0 +1,53 @@ +.TH "postgres-operator " "1" " Container Image Pages" "Jeff McCormick" "August 17, 2018" +.nh +.ad l + + +.SH NAME +.PP +postgres-operator \- Container image for Crunchy Data's PostgreSQL Operator + + +.SH DESCRIPTION +.PP +The Postgres Operator is a controller, written in Golang, that uses the Kubernetes API and CustomResourceDefinition concepts to offer users a CLI which enables them to create and manage PostgreSQL databases and clusters running on a Kubernetes cluster. + +.PP +The container itself consists of: + \- RHEL7 base image + \- Bash script that performs the container startup + \- PostgreSQL binary packages + +.PP +Files added to the container during Docker build include: /help.1. + + +.SH USAGE +.PP +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + + +.SH LABELS +.PP +The starter container includes the following LABEL settings: + +.PP +That atomic command runs the Docker command set in this label: + +.PP +\fB\fCName=\fR + +.PP +The registry location and name of the image. For example, Name="crunchydata/postgres-operator". + +.PP +\fB\fCVersion=\fR + +.PP +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +.PP +\fB\fCRelease=\fR + +.PP +The specific release number of the container. For example, Release="3.2" diff --git a/redhat/atomic/postgres_operator/help.md b/redhat/atomic/postgres_operator/help.md new file mode 100644 index 0000000000..714ce7355d --- /dev/null +++ b/redhat/atomic/postgres_operator/help.md @@ -0,0 +1,36 @@ += postgres-operator (1) +Jeff McCormick +August 17, 2018 + +== NAME +postgres-operator - Container image for Crunchy Data's PostgreSQL Operator + +== DESCRIPTION +The Postgres Operator is a controller, written in Golang, that uses the Kubernetes API and CustomResourceDefinition concepts to offer users a CLI which enables them to create and manage PostgreSQL databases and clusters running on a Kubernetes cluster. + +The container itself consists of: + - RHEL7 base image + - Bash script that performs the container startup + - PostgreSQL binary packages + +Files added to the container during Docker build include: /help.1. + +== USAGE +For more information on the PostgreSQL Operator, see the official Crunchy Postgres Operator repository on GitHub. + +== LABELS +The starter container includes the following LABEL settings: + +That atomic command runs the Docker command set in this label: + +`Name=` + +The registry location and name of the image. For example, Name="crunchydata/postgres-operator". + +`Version=` + +The Red Hat Enterprise Linux version from which the container was built. For example, Version="7.5" + +`Release=` + +The specific release number of the container. For example, Release="3.2" diff --git a/licenses b/redhat/licenses/LICENSE.txt similarity index 100% rename from licenses rename to redhat/licenses/LICENSE.txt diff --git a/rhel7/Dockerfile.pgo-apiserver.rhel7 b/rhel7/Dockerfile.pgo-apiserver.rhel7 index 8ed2c8887b..100562e8b4 100644 --- a/rhel7/Dockerfile.pgo-apiserver.rhel7 +++ b/rhel7/Dockerfile.pgo-apiserver.rhel7 @@ -3,25 +3,27 @@ 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's postgres operator api" \ - description="crunchy data postgres operator api" + 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" +ENV PGVERSION="10" -COPY licenses /licenses +COPY redhat/atomic/pgo_apiserver/help.1 /help.1 +COPY redhat/atomic/pgo_apiserver/help.md /help.md +COPY redhat/licenses /licenses + +# Crunchy PostgreSQL repository -# Crunchy Postgres repo ADD conf/CRUNCHY-GPG-KEY.public / ADD conf/crunchypg96.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 ADD bin/apiserver /usr/local/bin diff --git a/rhel7/Dockerfile.pgo-load.rhel7 b/rhel7/Dockerfile.pgo-load.rhel7 index e0c072df0f..ef7802225a 100644 --- a/rhel7/Dockerfile.pgo-load.rhel7 +++ b/rhel7/Dockerfile.pgo-load.rhel7 @@ -4,24 +4,27 @@ 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's postgres operator load" \ - description="crunchy data postgres operator load" + summary="Crunchy Data PostgreSQL Operator - Load Data" \ + description="Loads a CSV or JSON file into the database." ENV PGVERSION="10" -COPY licenses /licenses +COPY redhat/atomic/pgo_load/help.1 /help.1 +COPY redhat/atomic/pgo_load/help.md /help.md +COPY redhat/licenses /licenses + +# Crunchy PostgreSQL repository -# Crunchy Postgres repo ADD conf/CRUNCHY-GPG-KEY.public / ADD conf/crunchypg96.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 +RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm RUN yum -y update && yum -y install epel-release \ && yum install -y \ @@ -33,10 +36,10 @@ RUN yum -y update && yum -y install epel-release \ && yum -y install postgresql${PGVERSION} \ && yum clean all -y -RUN mkdir -p /opt/cpm/bin /opt/cpm/conf +RUN mkdir -p /opt/cpm/bin /opt/cpm/conf ADD bin/pgo-load/ /opt/cpm/bin ADD conf/pgo-load/ /opt/cpm/conf -RUN chown -R 26:26 /opt/cpm +RUN chown -R 26:26 /opt/cpm VOLUME /pgdata diff --git a/rhel7/Dockerfile.pgo-lspvc.rhel7 b/rhel7/Dockerfile.pgo-lspvc.rhel7 index 6a477bea51..f59132185a 100644 --- a/rhel7/Dockerfile.pgo-lspvc.rhel7 +++ b/rhel7/Dockerfile.pgo-lspvc.rhel7 @@ -3,21 +3,19 @@ FROM registry.access.redhat.com/rhel7 MAINTAINER jeff.mccormick@crunchydata.com LABEL name="pgo-lspvc" \ - vendor="crunchydata.com" \ - Version="7.5" \ - Release="3.2.0" \ - run='docker run -d -p 8080:80 --name=web-app web-app' \ - summary="crunchy data's postgres operator lspvc" \ - description="crunchy data postgres operator lspvc" - - - -COPY licenses /licenses + vendor="crunchydata.com" \ + 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" +COPY redhat/atomic/pgo_lspvc/help.1 /help.1 +COPY redhat/atomic/pgo_lspvc/help.md /help.md +COPY redhat/licenses /licenses RUN yum -y update && yum -y clean all - VOLUME ["/pgdata"] USER 26 diff --git a/rhel7/Dockerfile.pgo-rmdata.rhel7 b/rhel7/Dockerfile.pgo-rmdata.rhel7 index b037606f80..2d0ed534d7 100644 --- a/rhel7/Dockerfile.pgo-rmdata.rhel7 +++ b/rhel7/Dockerfile.pgo-rmdata.rhel7 @@ -3,15 +3,16 @@ FROM registry.access.redhat.com/rhel7 MAINTAINER jeff.mccormick@crunchydata.com LABEL name="pgo-rmdata" \ - vendor="crunchydata.com" \ - Version="7.5" \ - Release="3.2.0" \ - run='docker run -d -p 8080:80 --name=web-app web-app' \ - summary="crunchy data's postgres operator rmdata" \ - description="crunchy data postgres operator rmdata" - -COPY licenses /licenses - + vendor="crunchydata.com" \ + 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" + +COPY redhat/atomic/pgo_rmdata/help.1 /help.1 +COPY redhat/atomic/pgo_rmdata/help.md /help.md +COPY redhat/licenses /licenses RUN yum -y update && yum -y clean all diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7 index bfd1327e3a..2956793173 100644 --- a/rhel7/Dockerfile.postgres-operator.rhel7 +++ b/rhel7/Dockerfile.postgres-operator.rhel7 @@ -3,20 +3,23 @@ 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's postgres operator" \ - description="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" -COPY licenses /licenses +ENV PGVERSION="10" -ENV PGVERSION="10" +COPY redhat/atomic/postgres_operator/help.1 /help.1 +COPY redhat/atomic/postgres_operator/help.md /help.md +COPY redhat/licenses /licenses + +# Crunchy PostgreSQL repository -# Crunchy Postgres repo ADD conf/CRUNCHY-GPG-KEY.public / ADD conf/crunchypg96.repo /etc/yum.repos.d/ RUN rpm --import CRUNCHY-GPG-KEY.public