Merge 7784559b85 into 488814d187

Merge pull request #440 from wallabag/impr/nginx-dualstack
Support dualstack listen on nginx
2026-02-27 12:17:37 +01:00 · 2025-04-30 17:04:23 -04:00 · 2025-04-29 22:56:19 +02:00 · 2025-04-20 17:22:46 +02:00 · 2023-12-30 17:40:40 -08:00 · 2023-12-30 17:39:24 -08:00
2 changed files with 14 additions and 8 deletions
--- a/root/entrypoint.sh
+++ b/root/entrypoint.sh
@ -74,18 +74,25 @@ provisioner() {
    # Configure Postgres database
    if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] && [ "$POPULATE_DATABASE" = "True" ] && [ "$POSTGRES_PASSWORD" != "" ] ; then
        export PGPASSWORD="${POSTGRES_PASSWORD}"
+        USER_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+            -c "SELECT 1 FROM pg_roles WHERE rolname = '${SYMFONY__ENV__DATABASE_USER}';")"
+        if [ "$USER_EXISTS" != "1" ]; then
+            psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+                 -c "CREATE ROLE ${SYMFONY__ENV__DATABASE_USER} with PASSWORD '${SYMFONY__ENV__DATABASE_PASSWORD}' LOGIN;"
+        fi
        DATABASE_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
            -c "SELECT 1 FROM pg_catalog.pg_database WHERE datname = '${SYMFONY__ENV__DATABASE_NAME}';")"
        if [ "$DATABASE_EXISTS" != "1" ]; then
            echo "Configuring the Postgres database ..."
            psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
                -c "CREATE DATABASE ${SYMFONY__ENV__DATABASE_NAME};"
-            USER_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
-                -c "SELECT 1 FROM pg_roles WHERE rolname = '${SYMFONY__ENV__DATABASE_USER}';")"
-            if [ "$USER_EXISTS" != "1" ]; then
-                psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
-                    -c "CREATE ROLE ${SYMFONY__ENV__DATABASE_USER} with PASSWORD '${SYMFONY__ENV__DATABASE_PASSWORD}' LOGIN;"
-            fi
+        fi
+
+        TABLES_EXIST="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+            -c "SELECT 1 FROM pg_catalog.pg_tables WHERE schemaname = 'public';")"
+        if [ "$TABLES_EXIST" == "" ]; then
+            echo "Installing Wallabag ..."
+            exec su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
            install_wallabag
        else
            echo "WARN: Postgres database is already configured. Remove the environment variable with root password."
--- a/root/etc/nginx/nginx.conf
+++ b/root/etc/nginx/nginx.conf
@ -35,8 +35,7 @@ http {
    }

    server {
-        listen 80;
-        listen [::0]:80;
+        listen [::]:80 ipv6only=off;
        server_name _;
        root /var/www/wallabag/web;
Author	SHA1	Message	Date
Scott Weldon	9e05e912fc	Merge `7784559b85` into `488814d187`	2025-04-30 17:04:23 -04:00
Kevin Decherf	488814d187	Merge pull request #440 from wallabag/impr/nginx-dualstack Support dualstack listen on nginx	2025-04-29 22:56:19 +02:00
Kevin Decherf	3808b524fc	Support dualstack listen on nginx Fixes #422 Supersedes #435 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2025-04-20 17:22:46 +02:00
Scott Weldon	7784559b85	Run migrations when installing This throws errors, but they can be ignored.	2023-12-30 17:40:40 -08:00
Scott Weldon	4d52431c95	Check if tables exist before installing This works better than checking just the database, because it could be that an empty database has already been created (with e.g. Docker Compose). TABLES_EXIST should be empty if no tables, or will return a 1 for each table that exists.	2023-12-30 17:39:24 -08:00
Scott Weldon	64d2a60888	Move user create outside of database-exists check	2023-12-25 10:24:57 -08:00