diff --git a/Makefile b/Makefile index 9abc4f410..fc6e16477 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ endif # Default values if not already set CCP_BASEOS ?= centos8 CCP_PGVERSION ?= 13 -CCP_PG_FULLVERSION ?= 13.2 +CCP_PG_FULLVERSION ?= 13.3 CCP_PATRONI_VERSION ?= 2.0.2 CCP_BACKREST_VERSION ?= 2.31 -CCP_VERSION ?= 4.6.2 +CCP_VERSION ?= 4.6.3 CCP_POSTGIS_VERSION ?= 3.0 PACKAGER ?= yum diff --git a/docs/content/container-specifications/crunchy-pgadmin4.md b/docs/content/container-specifications/crunchy-pgadmin4.md index 6effc5f65..5c263699c 100644 --- a/docs/content/container-specifications/crunchy-pgadmin4.md +++ b/docs/content/container-specifications/crunchy-pgadmin4.md @@ -26,7 +26,7 @@ The following features are supported by the crunchy-pgadmin4 container: The crunchy-pgadmin4 Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * [pgAdmin4](https://www.pgadmin.org/) * CentOS 7, CentOS 8 - publicly available * UBI 7, UBI 8 - customers only diff --git a/docs/content/container-specifications/crunchy-pgbackrest.md b/docs/content/container-specifications/crunchy-pgbackrest.md index 0870ee9cc..3992d77a6 100644 --- a/docs/content/container-specifications/crunchy-pgbackrest.md +++ b/docs/content/container-specifications/crunchy-pgbackrest.md @@ -11,7 +11,7 @@ See the [pgBackRest](https://github.com/pgbackrest/pgbackrest) guide for more de ## Running Modes -The `crunchy-pgbackrest` image can be run in modes to enable different functionality. +The `crunchy-pgbackrest` image can be run in modes to enable different functionality. The `MODE` environment variable must be set to run the image in the required mode. Each mode uses environment variables to configure how the container will be run. | Running Mode | `MODE` setting | @@ -34,7 +34,7 @@ The following volumes are mounted by the `crunchy-pgbackrest` container: The crunchy-backrest-restore Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * [pgBackRest](https://pgbackrest.org/) (2.31) * CentOS 7, CentOS 8 - publicly available * UBI 7, UBI 8 - customers only diff --git a/docs/content/container-specifications/crunchy-pgbouncer.md b/docs/content/container-specifications/crunchy-pgbouncer.md index 64ebd5691..4a7694872 100644 --- a/docs/content/container-specifications/crunchy-pgbouncer.md +++ b/docs/content/container-specifications/crunchy-pgbouncer.md @@ -20,7 +20,7 @@ The following features are supported by the crunchy-pgbouncer container: The crunchy-pgbouncer Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * [pgBouncer](https://pgbouncer.github.io/) * CentOS 7, CentOS 8 - publicly available * UBI 7, UBI 8 - customers only diff --git a/docs/content/container-specifications/crunchy-pgpool.md b/docs/content/container-specifications/crunchy-pgpool.md index 6c263059b..65cd3bad4 100644 --- a/docs/content/container-specifications/crunchy-pgpool.md +++ b/docs/content/container-specifications/crunchy-pgpool.md @@ -26,7 +26,7 @@ The following features are supported by the `crunchy-postgres` container: The crunchy-pgpool Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * [pgPool II](http://www.pgpool.net/mediawiki/index.php/Main_Page) * CentOS 7, CentOS 8 - publicly available * UBI 7, UBI 8 - customers only diff --git a/docs/content/container-specifications/crunchy-postgres/_index.md b/docs/content/container-specifications/crunchy-postgres/_index.md index 3552e1fa3..d10c807c3 100644 --- a/docs/content/container-specifications/crunchy-postgres/_index.md +++ b/docs/content/container-specifications/crunchy-postgres/_index.md @@ -17,7 +17,7 @@ The following features are supported by the `crunchy-postgres` container: The crunchy-postgres Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * [pgBackRest](https://pgbackrest.org/) (2.31) * pgBench (12.4, 11.9, 10.14, 9.6.19 and 9.5.23) * rsync diff --git a/docs/content/container-specifications/crunchy-upgrade.md b/docs/content/container-specifications/crunchy-upgrade.md index 51c9657d5..153a0e42f 100644 --- a/docs/content/container-specifications/crunchy-upgrade.md +++ b/docs/content/container-specifications/crunchy-upgrade.md @@ -36,7 +36,7 @@ The following features are supported by the crunchy-upgrade container: The crunchy-upgrade Docker image contains the following packages (versions vary depending on PostgreSQL version): -* PostgreSQL (13.2, 12.6, 11.11, 10.16, 9.6.21 and 9.5.25) +* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22) * CentOS 7, CentOS 8 - publicly available * UBI 7, UBI 8 - customers only diff --git a/docs/content/contributing/building.md b/docs/content/contributing/building.md index 024fc6362..6b429abed 100644 --- a/docs/content/contributing/building.md +++ b/docs/content/contributing/building.md @@ -50,9 +50,9 @@ export GOBIN=$GOPATH/bin # set bin path export PATH=$PATH:$GOBIN # add Go bin path to your overall path export CCP_BASEOS=centos8 # centos8 for CentOS, ubi8 for Red Hat Universal Base Image export CCP_PGVERSION=12 # The PostgreSQL major version -export CCP_PG_FULLVERSION=13.2 +export CCP_PG_FULLVERSION=13.3 export CCP_POSTGIS_VERSION=3.0 -export CCP_VERSION=4.6.2 +export CCP_VERSION=4.6.3 export CCP_IMAGE_PREFIX=crunchydata # Prefix to put before all the container image names export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION # Used to tag the images export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION # Used to tag images that include PostGIS @@ -69,9 +69,9 @@ export GOBIN=$GOPATH/bin export PATH=$PATH:$GOBIN export CCP_BASEOS=centos8 export CCP_PGVERSION=12 -export CCP_PG_FULLVERSION=13.2 +export CCP_PG_FULLVERSION=13.3 export CCP_POSTGIS_VERSION=3.0 -export CCP_VERSION=4.6.2 +export CCP_VERSION=4.6.3 export CCP_IMAGE_PREFIX=crunchydata export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION diff --git a/docs/content/examples/administration/upgrade.md b/docs/content/examples/administration/upgrade.md index 08bd560d7..f09b4bd57 100644 --- a/docs/content/examples/administration/upgrade.md +++ b/docs/content/examples/administration/upgrade.md @@ -9,7 +9,7 @@ weight: 81 {{% notice tip %}} This example assumes you have run *primary* using a PostgreSQL 12 or 13 image -such as `centos8-13.2-4.6.2` prior to running this upgrade. +such as `centos8-13.3-4.6.3` prior to running this upgrade. {{% /notice %}} The upgrade container will let you perform a `pg_upgrade` from a PostgreSQL version 9.5, 9.6, 10, 11, 12, or 13 database to the available any of the higher versions of PostgreSQL versions that are currently support which are 9.6, 10, 11, 12, and 13. It does not do multi-version upgrades so you will need to for example do a 10 to 11 and then a 11 to 12 to get to version 12. @@ -17,7 +17,7 @@ The upgrade container will let you perform a `pg_upgrade` from a PostgreSQL vers Prior to running this example, make sure your `CCP_IMAGE_TAG` environment variable is using the next major version of PostgreSQL that you want to upgrade to. For example, if you're upgrading from 12 to 13, make -sure the variable references a PostgreSQL 13 image such as `centos8-13.2-4.6.2`. +sure the variable references a PostgreSQL 13 image such as `centos8-13.3-4.6.3`. This will create the following in your Kubernetes environment: diff --git a/docs/content/installation-guide/installation-guide.md b/docs/content/installation-guide/installation-guide.md index 467a9251c..05f83e957 100644 --- a/docs/content/installation-guide/installation-guide.md +++ b/docs/content/installation-guide/installation-guide.md @@ -71,7 +71,7 @@ Make directories to hold the GitHub clone that also work with the Go workspace s $ cd $HOME/cdev/src/github.com/crunchydata $ git clone https://github.com/crunchydata/crunchy-containers $ cd crunchy-containers - $ git checkout v4.6.2 + $ git checkout v4.6.3 # Your Shell Environment @@ -91,9 +91,9 @@ line starting with #: export PATH=$PATH:$GOBIN # add Go bin path to your overall path export CCP_BASEOS=centos8 # centos8 for CentOS, ubi8 for Red Hat Universal Base Image export CCP_PGVERSION=12 # The PostgreSQL major version - export CCP_PG_FULLVERSION=13.2 + export CCP_PG_FULLVERSION=13.3 export CCP_POSTGIS_VERSION=3.0 # The PostGIS version - export CCP_VERSION=4.6.2 + export CCP_VERSION=4.6.3 export CCP_IMAGE_PREFIX=crunchydata # Prefix to put before all the container image names export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION # Used to tag the images export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION # Used to tag images that include PostGIS diff --git a/examples/docker/swarm-service/docker-compose.yml b/examples/docker/swarm-service/docker-compose.yml index ff8894999..a9eae666a 100755 --- a/examples/docker/swarm-service/docker-compose.yml +++ b/examples/docker/swarm-service/docker-compose.yml @@ -4,7 +4,7 @@ version: "3.3" services: primary: hostname: 'primary' - image: crunchydata/crunchy-postgres:centos8-13.2-4.6.2 + image: crunchydata/crunchy-postgres:centos8-13.3-4.6.3 environment: - PGHOST=/tmp - MAX_CONNECTIONS=10 @@ -29,7 +29,7 @@ services: - node.labels.type == primary - node.role == worker replica: - image: crunchydata/crunchy-postgres:centos8-13.2-4.6.2 + image: crunchydata/crunchy-postgres:centos8-13.3-4.6.3 environment: - PGHOST=/tmp - MAX_CONNECTIONS=10 diff --git a/examples/helm/custom-config/Chart.yaml b/examples/helm/custom-config/Chart.yaml index 317340031..c8fba1ca3 100644 --- a/examples/helm/custom-config/Chart.yaml +++ b/examples/helm/custom-config/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: custom-config description: Deploys a basic single PostgreSQL primary database with custom configurations. version: 1 -appVersion: 4.6.2 +appVersion: 4.6.3 keywords: - postgresql - postgres diff --git a/examples/helm/custom-config/README.md b/examples/helm/custom-config/README.md index b838524dc..6d20386f6 100644 --- a/examples/helm/custom-config/README.md +++ b/examples/helm/custom-config/README.md @@ -66,10 +66,10 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s ```console $ helm install custom-config --name custom-config \ - --set Image.tag=centos8-13.2-4.6.2 + --set Image.tag=centos8-13.3-4.6.3 ``` -The above command changes the image tag of the container to of `centos8-13.2-4.6.2`. +The above command changes the image tag of the container to of `centos8-13.3-4.6.3`. > **Tip**: You can use the default [values.yaml](values.yaml) @@ -84,7 +84,7 @@ The above command changes the image tag of the container to of `centos8-13.2-4.6 | `.serviceType` | The type of service | `ClusterIP` | `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` | | `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` | -| `.image.tag` | The image tag to be used. | `centos8-13.2-4.6.2` | +| `.image.tag` | The image tag to be used. | `centos8-13.3-4.6.3` | | `.resources.cpu` | Defines a limit for CPU | `200m` | | `.resources.memory` | Defines a limit for memory | `512Mi` | diff --git a/examples/helm/custom-config/values.yaml b/examples/helm/custom-config/values.yaml index 2bc95304b..505a6511a 100644 --- a/examples/helm/custom-config/values.yaml +++ b/examples/helm/custom-config/values.yaml @@ -10,7 +10,7 @@ serviceType: ClusterIP image: repository: crunchydata container: crunchy-postgres - tag: centos8-13.2-4.6.2 + tag: centos8-13.3-4.6.3 resources: cpu: 200m memory: 512Mi diff --git a/examples/helm/primary-replica/Chart.yaml b/examples/helm/primary-replica/Chart.yaml index 981c6f6f8..9eaeccf5a 100644 --- a/examples/helm/primary-replica/Chart.yaml +++ b/examples/helm/primary-replica/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: primary-replica description: Deploy a basic crunchy primary and replica cluster version: 1 -appVersion: 4.6.2 +appVersion: 4.6.3 keywords: - postgresql - postgres diff --git a/examples/helm/primary-replica/README.md b/examples/helm/primary-replica/README.md index 528bbc359..2fcf624e2 100644 --- a/examples/helm/primary-replica/README.md +++ b/examples/helm/primary-replica/README.md @@ -102,10 +102,10 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s ```console $ helm install primary-replica --name primary-replica \ - --set Image.tag=centos8-13.2-4.6.2 + --set Image.tag=centos8-13.3-4.6.3 ``` -The above command changes the image tag of the container to `centos8-13.2-4.6.2`. +The above command changes the image tag of the container to `centos8-13.3-4.6.3`. > **Tip**: You can use the default [values.yaml](values.yaml) @@ -121,7 +121,7 @@ The above command changes the image tag of the container to `centos8-13.2-4.6.2` | `.serviceType` | The type of service | `ClusterIP` | `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` | | `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` | -| `.image.tag` | The image tag to be used. | `centos8-13.2-4.6.2` | +| `.image.tag` | The image tag to be used. | `centos8-13.3-4.6.3` | | `.pv.storage` | Size of persistent volume | 400M | | `.pv.name` | Name of persistent volume | `primary-pv` | | `.pv.mode` | The storage mode for the persistent volume | `ReadWriteMany` | diff --git a/examples/helm/primary-replica/values.yaml b/examples/helm/primary-replica/values.yaml index 9807bcc9e..709917687 100644 --- a/examples/helm/primary-replica/values.yaml +++ b/examples/helm/primary-replica/values.yaml @@ -12,7 +12,7 @@ serviceType: ClusterIP image: repository: crunchydata container: crunchy-postgres - tag: centos8-11.11-4.6.2 + tag: centos8-11.12-4.6.3 pv: storage: 400M name: primary-pv diff --git a/examples/helm/primary/Chart.yaml b/examples/helm/primary/Chart.yaml index 18b0c1c1a..8749d2faf 100644 --- a/examples/helm/primary/Chart.yaml +++ b/examples/helm/primary/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: basic description: Deploys a single PostgreSQL primary database version: 1 -appVersion: 4.6.2 +appVersion: 4.6.3 keywords: - postgresql - postgres diff --git a/examples/helm/primary/README.md b/examples/helm/primary/README.md index b65b07609..cc79399ed 100644 --- a/examples/helm/primary/README.md +++ b/examples/helm/primary/README.md @@ -65,7 +65,7 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s ```console $ helm install primary --name primary \ - --set Image.tag=centos8-13.2-4.6.2 + --set Image.tag=centos8-13.3-4.6.3 ``` > **Tip**: You can use the default [values.yaml](values.yaml) @@ -81,7 +81,7 @@ $ helm install primary --name primary \ | `.serviceType` | The type of service | `ClusterIP` | `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` | | `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` | -| `.image.tag` | The image tag to be used. | `centos8-13.2-4.6.2` | +| `.image.tag` | The image tag to be used. | `centos8-13.3-4.6.3` | | `.resources.cpu` | Defines a limit for CPU | `200m` | | `.resources.memory` | Defines a limit for memory | `512Mi` | diff --git a/examples/helm/primary/values.yaml b/examples/helm/primary/values.yaml index a11048546..153063f92 100644 --- a/examples/helm/primary/values.yaml +++ b/examples/helm/primary/values.yaml @@ -10,7 +10,7 @@ serviceType: ClusterIP image: repository: crunchydata container: crunchy-postgres - tag: centos8-13.2-4.6.2 + tag: centos8-13.3-4.6.3 resources: cpu: 200m memory: 512Mi diff --git a/examples/helm/template-small/Chart.yaml b/examples/helm/template-small/Chart.yaml index 18e77df9b..d48c8ab7e 100644 --- a/examples/helm/template-small/Chart.yaml +++ b/examples/helm/template-small/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: template-small description: The Crunchy template-small configuration includes a single primary with limited CPU and memory, suitable for development purposes. version: 1 -appVersion: 4.6.2 +appVersion: 4.6.3 keywords: - postgresql - postgres diff --git a/examples/helm/template-small/README.md b/examples/helm/template-small/README.md index 51d0a4554..7b5840c90 100644 --- a/examples/helm/template-small/README.md +++ b/examples/helm/template-small/README.md @@ -75,7 +75,7 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s ```console $ helm install template-small --name template-small \ - --set Image.tag=centos8-13.2-4.6.2 + --set Image.tag=centos8-13.3-4.6.3 ``` > **Tip**: You can use the default [values.yaml](values.yaml) @@ -91,7 +91,7 @@ $ helm install template-small --name template-small \ | `.serviceType` | The type of service | `ClusterIP` | `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` | | `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` | -| `.image.tag` | The image tag to be used. | `centos8-13.2-4.6.2` | +| `.image.tag` | The image tag to be used. | `centos8-13.3-4.6.3` | | `.resources.cpu` | Defines a limit for CPU | `200m` | | `.resources.memory` | Defines a limit for memory | `512Mi` | diff --git a/examples/helm/template-small/values.yaml b/examples/helm/template-small/values.yaml index d162c1f80..25e2da7d5 100644 --- a/examples/helm/template-small/values.yaml +++ b/examples/helm/template-small/values.yaml @@ -12,7 +12,7 @@ serviceType: ClusterIP image: repository: crunchydata container: crunchy-postgres - tag: centos8-13.2-4.6.2 + tag: centos8-13.3-4.6.3 resources: cpu: 200m memory: 512Mi diff --git a/redhat/atomic/help.1 b/redhat/atomic/help.1 index 27433b9c9..2614e59bd 100644 --- a/redhat/atomic/help.1 +++ b/redhat/atomic/help.1 @@ -48,4 +48,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="4.6.2" +The specific release number of the container. For example, Release="4.6.3" diff --git a/redhat/atomic/help.md b/redhat/atomic/help.md index 19699cc11..fd5914884 100644 --- a/redhat/atomic/help.md +++ b/redhat/atomic/help.md @@ -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="4.6.2" +The specific release number of the container. For example, Release="4.6.3"