Merge pull request #334 from kartoza/upgrade_14

upgrade to PostgreSQL version 14
pull/335/head
mazano 2021-10-08 14:40:43 +02:00 zatwierdzone przez GitHub
commit 1b47114384
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
8 zmienionych plików z 13 dodań i 13 usunięć

Wyświetl plik

@ -13,6 +13,6 @@ LANG=en_US.UTF-8
# locale filter to include in the locale generator # locale filter to include in the locale generator
LANGS="en_US.UTF-8,id_ID.UTF-8" LANGS="en_US.UTF-8,id_ID.UTF-8"
POSTGRES_MAJOR_VERSION=13 POSTGRES_MAJOR_VERSION=14
POSTGIS_MAJOR_VERSION=3 POSTGIS_MAJOR_VERSION=3
POSTGIS_MINOR_RELEASE=1 POSTGIS_MINOR_RELEASE=1

Wyświetl plik

@ -24,7 +24,7 @@ jobs:
strategy: strategy:
matrix: matrix:
postgresMajorVersion: postgresMajorVersion:
- 13 - 14
postgisMajorVersion: postgisMajorVersion:
- 3 - 3
postgisMinorRelease: postgisMinorRelease:
@ -85,7 +85,7 @@ jobs:
strategy: strategy:
matrix: matrix:
postgresMajorVersion: postgresMajorVersion:
- 13 - 14
postgisMajorVersion: postgisMajorVersion:
- 3 - 3
postgisMinorRelease: postgisMinorRelease:

Wyświetl plik

@ -29,7 +29,7 @@ jobs:
strategy: strategy:
matrix: matrix:
postgresMajorVersion: postgresMajorVersion:
- 13 - 14
postgisMajorVersion: postgisMajorVersion:
- 3 - 3
postgisMinorRelease: postgisMinorRelease:

Wyświetl plik

@ -65,7 +65,7 @@ FROM postgis-base AS postgis-prod
# Reset ARG for version # Reset ARG for version
ARG IMAGE_VERSION ARG IMAGE_VERSION
ARG POSTGRES_MAJOR_VERSION=13 ARG POSTGRES_MAJOR_VERSION=14
ARG POSTGIS_MAJOR_VERSION=3 ARG POSTGIS_MAJOR_VERSION=3
ARG POSTGIS_MINOR_RELEASE=1 ARG POSTGIS_MINOR_RELEASE=1

Wyświetl plik

@ -7,7 +7,7 @@ volumes:
services: services:
db: db:
image: kartoza/postgis:13-3.1 image: kartoza/postgis:14-3.1
volumes: volumes:
- postgis-data:/var/lib/postgresql - postgis-data:/var/lib/postgresql
- dbbackups:/backups - dbbackups:/backups
@ -26,7 +26,7 @@ services:
test: "exit 0" test: "exit 0"
dbbackups: dbbackups:
image: kartoza/pg-backup:13.0 image: kartoza/pg-backup:14.0
hostname: pg-backups hostname: pg-backups
volumes: volumes:
- dbbackups:/backups - dbbackups:/backups

Wyświetl plik

@ -8,7 +8,7 @@ volumes:
services: services:
pg-publisher: pg-publisher:
image: kartoza/postgis:13.0 image: kartoza/postgis:14-3.1
restart: 'always' restart: 'always'
volumes: volumes:
- pg-publisher-data-dir:/var/lib/postgresql - pg-publisher-data-dir:/var/lib/postgresql
@ -25,7 +25,7 @@ services:
test: "exit 0" test: "exit 0"
pg-subscriber: pg-subscriber:
image: kartoza/postgis:13.0 image: kartoza/postgis:14-3.1
restart: 'always' restart: 'always'
volumes: volumes:
- pg-subscriber-data-dir:/var/lib/postgresql - pg-subscriber-data-dir:/var/lib/postgresql

Wyświetl plik

@ -8,7 +8,7 @@ volumes:
services: services:
pg-master: pg-master:
image: 'kartoza/postgis:13.0' image: kartoza/postgis:14-3.1
restart: 'always' restart: 'always'
# You can optionally mount to volume, to play with the persistence and # You can optionally mount to volume, to play with the persistence and
# observe how the slave will behave after restarts. # observe how the slave will behave after restarts.
@ -35,7 +35,7 @@ services:
test: "exit 0" test: "exit 0"
pg-slave: pg-slave:
image: 'kartoza/postgis:13.0' image: kartoza/postgis:14-3.1
restart: 'always' restart: 'always'
# You can optionally mount to volume, but we're not able to scale it # You can optionally mount to volume, but we're not able to scale it
# in that case. # in that case.

Wyświetl plik

@ -25,12 +25,12 @@ else
if [[ "${SSL_KEY_FILE}" != '/etc/ssl/private/ssl-cert-snakeoil.key' ]]; then if [[ "${SSL_KEY_FILE}" != '/etc/ssl/private/ssl-cert-snakeoil.key' ]]; then
PG_CONF_HOST='hostssl' PG_CONF_HOST='hostssl'
CERT_AUTH='cert' CERT_AUTH='cert'
CLIENT_VERIFY= CLIENT_VERIFY='clientcert=verify-full'
else else
# Used when using the default ssl certs # Used when using the default ssl certs
PG_CONF_HOST='hostssl' PG_CONF_HOST='hostssl'
CERT_AUTH=${PASSWORD_AUTHENTICATION} CERT_AUTH=${PASSWORD_AUTHENTICATION}
CLIENT_VERIFY='clientcert=0' CLIENT_VERIFY=
fi fi
fi fi