mirror
/
docker-postgis
kopia lustrzana https://github.com/kartoza/docker-postgis
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Some minor tweaks

pull/289/head
admire 2021-01-05 19:09:48 +02:00
rodzic ce862ea55d
commit 09c57349ee
5 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
Dockerfile
Wyświetl plik

@ -10,7 +10,7 @@ MAINTAINER Tim Sutton<tim@kartoza.com>
ARG IMAGE_VERSION ARG IMAGE_VERSION
ARG POSTGRES_MAJOR_VERSION=13 ARG POSTGRES_MAJOR_VERSION=13
ARG POSTGIS_MAJOR=3 ARG POSTGIS_MAJOR=3
ARG POSTGIS_MINOR_RELEASE=3.1 ARG POSTGIS_MINOR_RELEASE=1
@ -43,6 +43,7 @@ RUN set -eux \
RUN echo $POSTGRES_MAJOR_VERSION >/tmp/pg_version.txt RUN echo $POSTGRES_MAJOR_VERSION >/tmp/pg_version.txt
RUN echo $POSTGIS_MAJOR >/tmp/pg_major_version.txt
RUN echo $POSTGIS_MINOR_RELEASE >/tmp/pg_minor_version.txt RUN echo $POSTGIS_MINOR_RELEASE >/tmp/pg_minor_version.txt
ENV \ ENV \
PATH="$PATH:/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin" PATH="$PATH:/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin"

3
build.sh
Wyświetl plik

@ -1,8 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
POSTGRES_MAJOR_VERSION=13 POSTGRES_MAJOR_VERSION=13
POSTGIS_MINOR_RELEASE=1
cd base_build cd base_build
./build.sh ./build.sh
cd .. cd ..
docker build -t kartoza/postgis:manual-build . docker build -t kartoza/postgis:manual-build .
docker build --build-arg DISTRO=debian --build-arg IMAGE_VERSION=bullseye --build-arg IMAGE_VARIANT=slim -t kartoza/postgis:${POSTGRES_MAJOR_VERSION}.1 . docker build --build-arg DISTRO=debian --build-arg IMAGE_VERSION=bullseye --build-arg IMAGE_VARIANT=slim -t kartoza/postgis:${POSTGRES_MAJOR_VERSION}.${POSTGIS_MINOR_RELEASE} .

4
docker-compose.yml
Wyświetl plik

@ -7,7 +7,7 @@ volumes:
services: services:
db: db:
image: kartoza/postgis:12.0 image: kartoza/postgis:13.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:12.0 image: kartoza/pg-backup:13.0
hostname: pg-backups hostname: pg-backups
volumes: volumes:
- dbbackups:/backups - dbbackups:/backups

3
scripts/env-data.sh
Wyświetl plik

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
POSTGRES_MAJOR_VERSION=$(cat /tmp/pg_version.txt) POSTGRES_MAJOR_VERSION=$(cat /tmp/pg_version.txt)
POSTGIS_MAJOR=$(cat /tmp/pg_major_version.txt)
POSTGIS_MINOR_RELEASE=$(cat /tmp/pg_minor_version.txt) POSTGIS_MINOR_RELEASE=$(cat /tmp/pg_minor_version.txt)
DEFAULT_DATADIR="/var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main" DEFAULT_DATADIR="/var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main"
ROOT_CONF="/etc/postgresql/${POSTGRES_MAJOR_VERSION}/main" ROOT_CONF="/etc/postgresql/${POSTGRES_MAJOR_VERSION}/main"
@ -9,7 +10,7 @@ WAL_ARCHIVE="/opt/archivedir"
RECOVERY_CONF="$ROOT_CONF/recovery.conf" RECOVERY_CONF="$ROOT_CONF/recovery.conf"
POSTGRES="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/postgres" POSTGRES="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/postgres"
INITDB="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb" INITDB="/usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb"
SQLDIR="/usr/share/postgresql/${POSTGRES_MAJOR_VERSION}/contrib/postgis-$POSTGIS_MINOR_RELEASE/" SQLDIR="/usr/share/postgresql/${POSTGRES_MAJOR_VERSION}/contrib/postgis-${POSTGIS_MAJOR}.${POSTGIS_MINOR_RELEASE}/"
SETVARS="POSTGIS_ENABLE_OUTDB_RASTERS=1 POSTGIS_GDAL_ENABLED_DRIVERS=ENABLE_ALL" SETVARS="POSTGIS_ENABLE_OUTDB_RASTERS=1 POSTGIS_GDAL_ENABLED_DRIVERS=ENABLE_ALL"
LOCALONLY="-c listen_addresses='127.0.0.1'" LOCALONLY="-c listen_addresses='127.0.0.1'"
PG_BASEBACKUP="/usr/bin/pg_basebackup" PG_BASEBACKUP="/usr/bin/pg_basebackup"

4
scripts/setup-conf.sh
Wyświetl plik

@ -10,16 +10,16 @@ fi
# Refresh configuration in case environment settings changed. # Refresh configuration in case environment settings changed.
cat $CONF.template > $CONF cat $CONF.template > $CONF
# Reflect DATADIR loaction # Reflect DATA DIR location
# Delete any data_dir declarations # Delete any data_dir declarations
sed -i '/data_directory/d' $CONF sed -i '/data_directory/d' $CONF
echo "data_directory = '${DATADIR}'" >> $CONF
# Create a config to optimise postgis # Create a config to optimise postgis
if [[ -f ${ROOT_CONF}/postgis.conf ]];then if [[ -f ${ROOT_CONF}/postgis.conf ]];then
rm $CONF/postgis.conf rm $CONF/postgis.conf
fi fi
cat >> ${ROOT_CONF}/postgis.conf <<EOF cat >> ${ROOT_CONF}/postgis.conf <<EOF
data_directory = '${DATADIR}'
port = 5432 port = 5432
superuser_reserved_connections= 10 superuser_reserved_connections= 10
listen_addresses = '${IP_LIST}' listen_addresses = '${IP_LIST}'