add pgsql 13

Author: gggeek

.gitignore

@@ -36,6 +36,7 @@
 /docker/data/postgresql/10/*
 /docker/data/postgresql/11/*
 /docker/data/postgresql/12/*
+/docker/data/postgresql/13/*
 /docker/data/redis/*
 /docker/data/sqlite/3.27/*
 !/docker/data/composer_cache/.gitkeep
@@ -63,6 +64,7 @@
 !/docker/data/postgresql/10/.gitkeep
 !/docker/data/postgresql/11/.gitkeep
 !/docker/data/postgresql/12/.gitkeep
+!/docker/data/postgresql/13/.gitkeep
 !docker/data/redis/.gitkeep
 !docker/data/sqlite/3.27/.gitkeep
 
@@ -94,6 +96,7 @@
 /docker/logs/postgresql/10/*
 /docker/logs/postgresql/11/*
 /docker/logs/postgresql/12/*
+/docker/logs/postgresql/13/*
 /docker/logs/redis/*
 /docker/logs/web/redis/*
 /docker/logs/web/nginx/*
@@ -125,6 +128,7 @@
 !/docker/logs/postgresql/10/.gitkeep
 !/docker/logs/postgresql/11/.gitkeep
 !/docker/logs/postgresql/12/.gitkeep
+!/docker/logs/postgresql/13/.gitkeep
 !/docker/logs/redis/.gitkeep
 !/docker/logs/web/nginx/.gitkeep
 !/docker/logs/web/php/.gitkeep

README.md

@@ -28,7 +28,7 @@ In the meantime, you can try out http://sqlfiddle.com/, https://www.db-fiddle.co
 * Mysql: 5.5, 5.6, 5.7, 8.0
 * Percona Server for MySQL: 5.6, 5.7, 8.0
 * Oracle: 18c (18.4.0) Express Edition
-* PostgreSQL: 9.4, 9.5, 9.6, 10, 11, 12
+* PostgreSQL: 9.4, 9.5, 9.6, 10, 11, 12, 13
 * SQLite: 3.27
 
 

doc/WHATSNEW.md

@@ -1,3 +1,11 @@
+Version 0.17
+------------
+
+- New: added PostgreSQL 13 to the available databases
+
+- Improved: bumped the application dependencies to Symfony 4.4.16
+
+
 Version 0.16
 ------------
 

docker/.env

@@ -89,6 +89,7 @@ POSTGRESQL_9_6_VERSION=9.6
 POSTGRESQL_10_VERSION=10
 POSTGRESQL_11_VERSION=11
 POSTGRESQL_12_VERSION=12
+POSTGRESQL_13_VERSION=13
 MSSQLSERVER_2017_VERSION=2017-latest
 MSSQLSERVER_2019_VERSION=2019-latest
 

docker/compose/postgresql.yml

@@ -141,3 +141,24 @@ services:
             - CONTAINER_USER_UID
             - CONTAINER_USER_GID
             - POSTGRES_PASSWORD
+
+    postgresql_13:
+        build:
+            context: images/postgresql/13
+            args:
+                timezone: "${COMPOSE_TZ}"
+                do_update_os: "${COMPOSE_DO_UPDATE_OS}"
+                do_shrink_container: "${COMPOSE_DO_SHRINK_CONTAINERS}"
+                base_image_version: "${POSTGRESQL_13_VERSION}"
+        hostname: postgresql_13
+        container_name: "${COMPOSE_PROJECT_NAME}_postgresql_13"
+        #ports:
+        #    - "5437:5432"
+        volumes:
+            - ./config/postgresql/13/${COMPOSE_DB_SIZE}.conf:/etc/postgresql/conf.d/postgresql.conf
+            - ./data/postgresql/13:/var/lib/postgresql
+            - ./logs/postgresql/13:/var/log/postgresql
+        environment:
+            - CONTAINER_USER_UID
+            - CONTAINER_USER_GID
+            - POSTGRES_PASSWORD

docker/config/app/postgresql.yml

@@ -64,3 +64,13 @@ db3v4l:
             #server_version: '12'
             vendor: postgresql
             version: '12'
+        postgresql_13:
+            host: postgresql_13
+            port: 5432
+            user: postgres
+            password: '%env(POSTGRES_PASSWORD)%'
+            #charset: UTF8
+            #driver: pdo_pgsql
+            #server_version: '13'
+            vendor: postgresql
+            version: '13'

docker/config/postgresql/13/big.conf

@@ -0,0 +1,41 @@
+ARG base_image_version=13
+
+FROM postgres:${base_image_version}
+LABEL postgresql.version=13
+
+ARG timezone=none
+ARG do_update_os=true
+ARG do_shrink_container=true
+
+# Configure timezone
+# -----------------------------------------------------------------------------
+RUN if [ "${timezone}" != "none" ]; then echo "${timezone}" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata; fi
+
+# Update preinstalled packages
+# -----------------------------------------------------------------------------
+RUN if [ "${do_update_os}" != "false" ]; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade ; fi
+
+# Base packages
+# -----------------------------------------------------------------------------
+#RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+#    procps
+
+# PG config
+# -----------------------------------------------------------------------------
+RUN mkdir /etc/postgresql/conf.d
+COPY initdb.sh /docker-entrypoint-initdb.d/initdb.sh
+RUN chmod 755 /docker-entrypoint-initdb.d/initdb.sh
+
+# Clear archives in apt cache folder to slim down the image
+# -----------------------------------------------------------------------------
+RUN if [ "${do_shrink_container}" != "false" ]; then apt-get clean && rm -rf /var/lib/apt/lists/*; fi
+
+# Set up entrypoint
+# -----------------------------------------------------------------------------
+COPY bootstrap.sh /root/bootstrap.sh
+RUN chmod 755 /root/bootstrap.sh
+
+EXPOSE 5432
+
+ENTRYPOINT ["/root/bootstrap.sh"]
+CMD ["postgres", "-c listen_addresses=*"]

docker/config/postgresql/13/small.conf

@@ -0,0 +1,56 @@
+#!/bin/sh
+
+echo "[$(date)] Bootstrapping PostgreSQL..."
+
+clean_up() {
+    # Perform program exit housekeeping
+    echo "[$(date)] Stopping the service..."
+    pkill -x --signal term postgres
+    if [ -f /var/run/bootstrap_ok ]; then
+        rm /var/run/bootstrap_ok
+    fi
+    exit
+}
+
+# Allow any process to see if bootstrap finished by looking up this file
+if [ -f /var/run/bootstrap_ok ]; then
+    rm /var/run/bootstrap_ok
+fi
+
+echo "[$(date)] Fixing postgres user permissions..."
+
+ORIGPASSWD=$(cat /etc/passwd | grep postgres)
+ORIG_UID=$(echo "${ORIGPASSWD}" | cut -f3 -d:)
+ORIG_GID=$(echo "${ORIGPASSWD}" | cut -f4 -d:)
+ORIG_HOME=$(echo "${ORIGPASSWD}" | cut -f6 -d:)
+CONTAINER_USER_UID=${CONTAINER_USER_UID:=$ORIG_UID}
+CONTAINER_USER_GID=${CONTAINER_USER_GID:=$ORIG_GID}
+
+if [ "${CONTAINER_USER_UID}" != "${ORIG_UID}" -o "${CONTAINER_USER_GID}" != "${ORIG_GID}" ]; then
+    # note: we allow non-unique user and group ids...
+    groupmod -o -g "${CONTAINER_USER_GID}" postgres
+    usermod -o -u "${CONTAINER_USER_UID}" -g "${CONTAINER_USER_GID}" postgres
+fi
+if [ $(stat -c '%u' "/var/lib/postgresql") != "${CONTAINER_USER_UID}" -o $(stat -c '%g' "/var/lib/postgresql") != "${CONTAINER_USER_GID}" ]; then
+    # home dir == data dir
+    chown -R "${CONTAINER_USER_UID}":"${CONTAINER_USER_GID}" "/var/lib/postgresql"
+    #chown -R "${CONTAINER_USER_UID}":"${CONTAINER_USER_GID}" "/var/log/postgresql"
+fi
+
+chown -R postgres:postgres /var/run/postgresql
+
+if [ -d /tmpfs ]; then
+    chmod 0777 /tmpfs
+fi
+
+echo "[$(date)] Handing over control to /entrypoint.sh..."
+
+trap clean_up TERM
+
+/docker-entrypoint.sh $@ &
+
+echo "[$(date)] Bootstrap finished" | tee /var/run/bootstrap_ok
+
+tail -f /dev/null &
+child=$!
+wait "$child"

docker/data/postgresql/13/.gitkeep

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# This file is kindly executed by the entrypoint shell script provided in the docker postgres base image.
+
+echo "include_dir='/etc/postgresql/conf.d'" >> /var/lib/postgresql/data/postgresql.conf