wallabag/docker
1
0
Fork 1
mirror of https://github.com/wallabag/docker.git synced 2026-02-28 04:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: wallabag:2.6.13
Branches Tags
wallabag:master wallabag:rewrite
wallabag:2.6.14 wallabag:2.6.13 wallabag:2.6.12 wallabag:2.6.11 wallabag:2.6.10 wallabag:2.6.9 wallabag:2.6.8 wallabag:2.6.7 wallabag:2.6.6 wallabag:2.6.5 wallabag:2.6.4 wallabag:2.6.3 wallabag:2.6.2 wallabag:2.6.1 wallabag:2.5.4 wallabag:2.5.3 wallabag:2.5.2 wallabag:2.5.1 wallabag:2.5.0 wallabag:2.5.0-rc.1 wallabag:2.4.3 wallabag:2.4.2 wallabag:2.4.1 wallabag:2.4.0 wallabag:2.3.8 wallabag:2.3.7 wallabag:2.3.6 wallabag:2.3.5 wallabag:2.3.4 wallabag:2.3.3 wallabag:2.3.2 wallabag:2.3.1 wallabag:2.3.0 wallabag:2.2.3 wallabag:2.2.2 wallabag:2.2.1 wallabag:2.1.6 wallabag:2.1.4 wallabag:2.1.3 wallabag:2.1.2 wallabag:2.1.1 wallabag:2.0.8 wallabag:2.0.7 wallabag:2.0.6 wallabag:2.0.5 wallabag:2.0.4 wallabag:2.0.3 wallabag:2.0.2 wallabag:2.0.1
...
compare: wallabag:e0adcc265ec365ccd3399bc81ddfc7402d7da5f6
Branches Tags
wallabag:master wallabag:rewrite
wallabag:2.6.14 wallabag:2.6.13 wallabag:2.6.12 wallabag:2.6.11 wallabag:2.6.10 wallabag:2.6.9 wallabag:2.6.8 wallabag:2.6.7 wallabag:2.6.6 wallabag:2.6.5 wallabag:2.6.4 wallabag:2.6.3 wallabag:2.6.2 wallabag:2.6.1 wallabag:2.5.4 wallabag:2.5.3 wallabag:2.5.2 wallabag:2.5.1 wallabag:2.5.0 wallabag:2.5.0-rc.1 wallabag:2.4.3 wallabag:2.4.2 wallabag:2.4.1 wallabag:2.4.0 wallabag:2.3.8 wallabag:2.3.7 wallabag:2.3.6 wallabag:2.3.5 wallabag:2.3.4 wallabag:2.3.3 wallabag:2.3.2 wallabag:2.3.1 wallabag:2.3.0 wallabag:2.2.3 wallabag:2.2.2 wallabag:2.2.1 wallabag:2.1.6 wallabag:2.1.4 wallabag:2.1.3 wallabag:2.1.2 wallabag:2.1.1 wallabag:2.0.8 wallabag:2.0.7 wallabag:2.0.6 wallabag:2.0.5 wallabag:2.0.4 wallabag:2.0.3 wallabag:2.0.2 wallabag:2.0.1

6 Commits
2.6.13 ... e0adcc265e

Author SHA1 Message Date
Scott Weldon
e0adcc265e Merge 7784559b85 into 7d2f4919c6 2025-06-09 21:39:31 +02:00
Jérémy Benoist
7d2f4919c6 Merge pull request #426 from boraozgen/readme-update 
Update example compose file mariadb healthcheck command
 2025-06-05 09:01:48 +02:00
Bora Özgen
923dffae55 Update example compose file mariadb healthcheck command 2024-11-12 09:22:30 +01: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
2 changed files with 14 additions and 7 deletions
Expand all files Collapse all files

2
README.md
View File

@ -142,7 +142,7 @@ services:
volumes: volumes:
- /opt/wallabag/data:/var/lib/mysql - /opt/wallabag/data:/var/lib/mysql
healthcheck: healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"]
interval: 20s interval: 20s
timeout: 3s timeout: 3s
redis: redis:

19
root/entrypoint.sh
View File

@ -74,18 +74,25 @@ provisioner() {
# Configure Postgres database # Configure Postgres database
if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] && [ "$POPULATE_DATABASE" = "True" ] && [ "$POSTGRES_PASSWORD" != "" ] ; then if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] && [ "$POPULATE_DATABASE" = "True" ] && [ "$POSTGRES_PASSWORD" != "" ] ; then
export PGPASSWORD="${POSTGRES_PASSWORD}" 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}" \ 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}';")" -c "SELECT 1 FROM pg_catalog.pg_database WHERE datname = '${SYMFONY__ENV__DATABASE_NAME}';")"
if [ "$DATABASE_EXISTS" != "1" ]; then if [ "$DATABASE_EXISTS" != "1" ]; then
echo "Configuring the Postgres database ..." echo "Configuring the Postgres database ..."
psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \ psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
-c "CREATE DATABASE ${SYMFONY__ENV__DATABASE_NAME};" -c "CREATE DATABASE ${SYMFONY__ENV__DATABASE_NAME};"
USER_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \ fi
-c "SELECT 1 FROM pg_roles WHERE rolname = '${SYMFONY__ENV__DATABASE_USER}';")"
if [ "$USER_EXISTS" != "1" ]; then TABLES_EXIST="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \ -c "SELECT 1 FROM pg_catalog.pg_tables WHERE schemaname = 'public';")"
-c "CREATE ROLE ${SYMFONY__ENV__DATABASE_USER} with PASSWORD '${SYMFONY__ENV__DATABASE_PASSWORD}' LOGIN;" if [ "$TABLES_EXIST" == "" ]; then
fi echo "Installing Wallabag ..."
exec su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
install_wallabag install_wallabag
else else
echo "WARN: Postgres database is already configured. Remove the environment variable with root password." echo "WARN: Postgres database is already configured. Remove the environment variable with root password."