Добавил поддержку переменной окружения APP_DB - создание БД для приложения

sgrinko · sgrinko · commit 7ce64e41aa8f · 2022-05-19T18:19:08.000+03:00
diff --git a/12/docker-postgres/Dockerfile b/12/docker-postgres/Dockerfile
@@ -131,3 +131,33 @@ COPY ./postgres /usr/local/sbin
 RUN chmod +x /usr/local/bin/*.sh \
     && chmod +x /usr/local/sbin/postgres \
     && chmod +x /docker-entrypoint-initdb.d/*.sh
+
+# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
+# calls "Fast Shutdown mode" wherein new connections are disallowed and any
+# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
+# flush tables to disk, which is the best compromise available to avoid data
+# corruption.
+#
+# Users who know their applications do not keep open long-lived idle connections
+# may way to use a value of SIGTERM instead, which corresponds to "Smart
+# Shutdown mode" in which any existing sessions are allowed to finish and the
+# server stops when all sessions are terminated.
+#
+# See https://www.postgresql.org/docs/12/server-shutdown.html for more details
+# about available PostgreSQL server shutdown signals.
+#
+# See also https://www.postgresql.org/docs/12/server-start.html for further
+# justification of this as the default value, namely that the example (and
+# shipped) systemd service files use the "Fast Shutdown mode" for service
+# termination.
+#
+STOPSIGNAL SIGINT
+#
+# An additional setting that is recommended for all users regardless of this
+# value is the runtime "--stop-timeout" (or your orchestrator/runtime's
+# equivalent) for controlling how long to wait between sending the defined
+# STOPSIGNAL and sending SIGKILL (which is likely to cause data corruption).
+#
+# The default in most runtimes (such as Docker) is 10 seconds, and the
+# documentation at https://www.postgresql.org/docs/12/server-start.html notes
+# that even 90 seconds may not be long enough in many instances.
diff --git a/12/docker-postgres/initdb-extension.sh b/12/docker-postgres/initdb-extension.sh
@@ -51,20 +51,29 @@ fi
 
 psql -c "select pg_reload_conf();"
 
-# Create the 'template_extension' template db
-psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+# Create the 'template_extension' template DB and application DB
+if [ "$APP_DB" != "" ]; then
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD" -v APP_DB="$APP_DB"
+else
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+fi
 
 # Load extension into template_extension database and $POSTGRES_DB
-for DB in "$POSTGRES_DB" template_extension ; do
+for DB in "$POSTGRES_DB" template_extension "$APP_DB" ; do
+  if [ -n "$DB" ]; then
     echo "Loading extensions into $DB"
 
-    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server=\"$EMAIL_SERVER\"
+    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server="$EMAIL_SERVER"
 
     if [ "$DB" = "postgres" ] ; then
-        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server="$EMAIL_SERVER"
     else
-        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server="$EMAIL_SERVER"
+        if [ "$DB" != "template_extension" ] ; then
+            psql --dbname="$DB" -f /usr/local/bin/db_target.sql -v DEV_SCHEMA="$DEV_SCHEMA" -v email_server="$EMAIL_SERVER"
+        fi
     fi
+  fi
 done
 
 psql -f /usr/local/bin/post.sql
diff --git a/12/docker-postgres/pre.sql b/12/docker-postgres/pre.sql
@@ -9,6 +9,14 @@ select not exists(select true FROM pg_catalog.pg_database where datname='templat
     CREATE DATABASE template_extension IS_TEMPLATE true;
 \endif
 
+\if :{?APP_DB}
+  select not exists(select true FROM pg_catalog.pg_database where datname = :'APP_DB') as is_check
+  \gset
+  \if :is_check
+    CREATE DATABASE :"APP_DB";
+  \endif
+\endif
+
 -- create role deploy
 -- роль для деплоя, т.е. все объекты в БД должны быть созданы от нее, а не от пользователя postgres (sa)
 select not exists(select true FROM pg_catalog.pg_roles where rolname ilike '%deploy%') as is_check
diff --git a/12/docker_start_12.sh b/12/docker_start_12.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-docker run --name my_postgres_12 --shm-size 2147483648 -p 5433:5432/tcp \
+docker run --rm --name my_postgres_12 --shm-size 2147483648 -p 5433:5432/tcp \
            -v /var/lib/pgsql/12_1/data:/var/lib/postgresql/data \
            -v /var/log/postgresql1:/var/log/postgresql \
            -v /mnt/pgbak2/:/mnt/pgbak \
diff --git a/12/postgres-service.yml b/12/postgres-service.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/12/postgres-service_all.yml b/12/postgres-service_all.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/12/postgres-service_pgb.yml b/12/postgres-service_pgb.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/13/docker-postgres/Dockerfile b/13/docker-postgres/Dockerfile
@@ -131,3 +131,33 @@ COPY ./postgres /usr/local/sbin
 RUN chmod +x /usr/local/bin/*.sh \
     && chmod +x /usr/local/sbin/postgres \
     && chmod +x /docker-entrypoint-initdb.d/*.sh
+
+# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
+# calls "Fast Shutdown mode" wherein new connections are disallowed and any
+# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
+# flush tables to disk, which is the best compromise available to avoid data
+# corruption.
+#
+# Users who know their applications do not keep open long-lived idle connections
+# may way to use a value of SIGTERM instead, which corresponds to "Smart
+# Shutdown mode" in which any existing sessions are allowed to finish and the
+# server stops when all sessions are terminated.
+#
+# See https://www.postgresql.org/docs/12/server-shutdown.html for more details
+# about available PostgreSQL server shutdown signals.
+#
+# See also https://www.postgresql.org/docs/12/server-start.html for further
+# justification of this as the default value, namely that the example (and
+# shipped) systemd service files use the "Fast Shutdown mode" for service
+# termination.
+#
+STOPSIGNAL SIGINT
+#
+# An additional setting that is recommended for all users regardless of this
+# value is the runtime "--stop-timeout" (or your orchestrator/runtime's
+# equivalent) for controlling how long to wait between sending the defined
+# STOPSIGNAL and sending SIGKILL (which is likely to cause data corruption).
+#
+# The default in most runtimes (such as Docker) is 10 seconds, and the
+# documentation at https://www.postgresql.org/docs/12/server-start.html notes
+# that even 90 seconds may not be long enough in many instances.
diff --git a/13/docker-postgres/initdb-extension.sh b/13/docker-postgres/initdb-extension.sh
@@ -51,20 +51,29 @@ fi
 
 psql -c "select pg_reload_conf();"
 
-# Create the 'template_extension' template db
-psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+# Create the 'template_extension' template DB and application DB
+if [ "$APP_DB" != "" ]; then
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD" -v APP_DB="$APP_DB"
+else
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+fi
 
 # Load extension into template_extension database and $POSTGRES_DB
-for DB in "$POSTGRES_DB" template_extension ; do
+for DB in "$POSTGRES_DB" template_extension "$APP_DB" ; do
+  if [ -n "$DB" ]; then
     echo "Loading extensions into $DB"
 
-    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server=\"$EMAIL_SERVER\"
+    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server="$EMAIL_SERVER"
 
     if [ "$DB" = "postgres" ] ; then
-        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server="$EMAIL_SERVER"
     else
-        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server="$EMAIL_SERVER"
+        if [ "$DB" != "template_extension" ] ; then
+            psql --dbname="$DB" -f /usr/local/bin/db_target.sql -v DEV_SCHEMA="$DEV_SCHEMA" -v email_server="$EMAIL_SERVER"
+        fi
     fi
+  fi
 done
 
 psql -f /usr/local/bin/post.sql
diff --git a/13/docker-postgres/pre.sql b/13/docker-postgres/pre.sql
@@ -9,6 +9,14 @@ select not exists(select true FROM pg_catalog.pg_database where datname='templat
     CREATE DATABASE template_extension IS_TEMPLATE true;
 \endif
 
+\if :{?APP_DB}
+  select not exists(select true FROM pg_catalog.pg_database where datname = :'APP_DB') as is_check
+  \gset
+  \if :is_check
+    CREATE DATABASE :"APP_DB";
+  \endif
+\endif
+
 -- create role deploy
 -- роль для деплоя, т.е. все объекты в БД должны быть созданы от нее, а не от пользователя postgres (sa)
 select not exists(select true FROM pg_catalog.pg_roles where rolname ilike '%deploy%') as is_check
diff --git a/13/docker_start_13.sh b/13/docker_start_13.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-docker run --name my_postgres_13 --shm-size 2147483648 -p 5433:5432/tcp \
+docker run --rm --name my_postgres_13 --shm-size 2147483648 -p 5433:5432/tcp \
            -v /var/lib/pgsql/13_1/data:/var/lib/postgresql/data \
            -v /var/log/postgresql1:/var/log/postgresql \
            -v /mnt/pgbak2/:/mnt/pgbak \
diff --git a/13/postgres-service.yml b/13/postgres-service.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/13/postgres-service_all.yml b/13/postgres-service_all.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/13/postgres-service_pgb.yml b/13/postgres-service_pgb.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/14/docker-postgres/Dockerfile b/14/docker-postgres/Dockerfile
@@ -131,3 +131,33 @@ COPY ./postgres /usr/local/sbin
 RUN chmod +x /usr/local/bin/*.sh \
     && chmod +x /usr/local/sbin/postgres \
     && chmod +x /docker-entrypoint-initdb.d/*.sh
+
+# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
+# calls "Fast Shutdown mode" wherein new connections are disallowed and any
+# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
+# flush tables to disk, which is the best compromise available to avoid data
+# corruption.
+#
+# Users who know their applications do not keep open long-lived idle connections
+# may way to use a value of SIGTERM instead, which corresponds to "Smart
+# Shutdown mode" in which any existing sessions are allowed to finish and the
+# server stops when all sessions are terminated.
+#
+# See https://www.postgresql.org/docs/12/server-shutdown.html for more details
+# about available PostgreSQL server shutdown signals.
+#
+# See also https://www.postgresql.org/docs/12/server-start.html for further
+# justification of this as the default value, namely that the example (and
+# shipped) systemd service files use the "Fast Shutdown mode" for service
+# termination.
+#
+STOPSIGNAL SIGINT
+#
+# An additional setting that is recommended for all users regardless of this
+# value is the runtime "--stop-timeout" (or your orchestrator/runtime's
+# equivalent) for controlling how long to wait between sending the defined
+# STOPSIGNAL and sending SIGKILL (which is likely to cause data corruption).
+#
+# The default in most runtimes (such as Docker) is 10 seconds, and the
+# documentation at https://www.postgresql.org/docs/12/server-start.html notes
+# that even 90 seconds may not be long enough in many instances.
diff --git a/14/docker-postgres/initdb-extension.sh b/14/docker-postgres/initdb-extension.sh
@@ -51,20 +51,29 @@ fi
 
 psql -c "select pg_reload_conf();"
 
-# Create the 'template_extension' template db
-psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+# Create the 'template_extension' template DB and application DB
+if [ "$APP_DB" != "" ]; then
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD" -v APP_DB="$APP_DB"
+else
+  psql -f /usr/local/bin/pre.sql -v DEPLOY_PASSWORD="$DEPLOY_PASSWORD" -v PGBOUNCER_PASSWORD="$PGBOUNCER_PASSWORD"
+fi
 
 # Load extension into template_extension database and $POSTGRES_DB
-for DB in "$POSTGRES_DB" template_extension ; do
+for DB in "$POSTGRES_DB" template_extension "$APP_DB" ; do
+  if [ -n "$DB" ]; then
     echo "Loading extensions into $DB"
 
-    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server=\"$EMAIL_SERVER\"
+    psql --dbname="$DB" -f /usr/local/bin/db_all.sql -v email_server="$EMAIL_SERVER"
 
     if [ "$DB" = "postgres" ] ; then
-        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_postgres.sql -v email_server="$EMAIL_SERVER"
     else
-        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server=\"$EMAIL_SERVER\"
+        psql --dbname="$DB" -f /usr/local/bin/db_notpostgres.sql -v IS_SETUPDB=false -v DEV_SCHEMA="$DEV_SCHEMA" -v POSTGRES_PASSWORD="$POSTGRES_PASSWORD" -v email_server="$EMAIL_SERVER"
+        if [ "$DB" != "template_extension" ] ; then
+            psql --dbname="$DB" -f /usr/local/bin/db_target.sql -v DEV_SCHEMA="$DEV_SCHEMA" -v email_server="$EMAIL_SERVER"
+        fi
     fi
+  fi
 done
 
 psql -f /usr/local/bin/post.sql
diff --git a/14/docker-postgres/pre.sql b/14/docker-postgres/pre.sql
@@ -9,6 +9,14 @@ select not exists(select true FROM pg_catalog.pg_database where datname='templat
     CREATE DATABASE template_extension IS_TEMPLATE true;
 \endif
 
+\if :{?APP_DB}
+  select not exists(select true FROM pg_catalog.pg_database where datname = :'APP_DB') as is_check
+  \gset
+  \if :is_check
+    CREATE DATABASE :"APP_DB";
+  \endif
+\endif
+
 -- create role deploy
 -- роль для деплоя, т.е. все объекты в БД должны быть созданы от нее, а не от пользователя postgres (sa)
 select not exists(select true FROM pg_catalog.pg_roles where rolname ilike '%deploy%') as is_check
diff --git a/14/docker_start_14.sh b/14/docker_start_14.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-docker run --name my_postgres_14 --shm-size 2147483648 -p 5433:5432/tcp \
+docker run --rm --name my_postgres_14 --shm-size 2147483648 -p 5433:5432/tcp \
            -v /var/lib/pgsql/14_1/data:/var/lib/postgresql/data \
            -v /var/log/postgresql1:/var/log/postgresql \
            -v /mnt/pgbak2/:/mnt/pgbak \
diff --git a/14/postgres-service.yml b/14/postgres-service.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/14/postgres-service_all.yml b/14/postgres-service_all.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/14/postgres-service_pgb.yml b/14/postgres-service_pgb.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - "5433:5432"
     environment:
+#      APP_DB: "My_db"
 #      POSTGRES_INITDB_ARGS: "--locale=ru_RU.UTF8 --data-checksums"
       POSTGRES_PASSWORD: qweasdzxc
       POSTGRES_HOST_AUTH_METHOD: trust
diff --git a/README.md b/README.md
@@ -213,6 +213,7 @@ _Переменные использующиеся только при перв
 | POSTGRES_HOST_AUTH_METHOD | md5                                  | Эту необязательную переменную можно использовать для управления методом аутентификации для соединений с хостом для всех баз данных, всех пользователей и всех адресов. Это значение используется только на этапе первичной инициализации.                                                                                                                                                                                                                                                                      |
 | PGDATA                    | /var/lib/postgresql/data             | Эту необязательную переменную можно использовать для определения другого местоположения - например, подкаталога - для файлов базы данных. По умолчанию это /var/lib/postgresql/data. Если используемый вами том данных является точкой монтирования файловой системы (например, с постоянными дисками GCE) или удаленной папкой, которая не может быть подключена для пользователя postgres (например, некоторые точки монтирования в NFS), Postgres initdb рекомендует создать подкаталог для хранения данных |
 | POSTGRES_INITDB_WALDIR    | PGDATA/pg_wal                        | Эту необязательную переменную среды можно использовать для определения другого места для журнала транзакций Postgres. Иногда может быть желательно хранить журнал транзакций в другом каталоге, который может поддерживаться хранилищем с другими характеристиками производительности или надежности.                                                                                                                                                                                                          |
+| APP_DB                    |                                      | Эту необязательную переменную среды можно использовать для определения имени БД которую нужно создать сразу при старте контейнера. БД будет создана только если кластер БД не существует. БД создается также как если вручную создать БД на основе шаблонной БД template_extension и по ней пргонать скрипт update-extension.sh                                                                                                                                                                                |
 
 Пример показывающий использование подкаталога для каталога данных:
 
