diff options
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.postgres | 6 | ||||
| -rwxr-xr-x | docker/entrypoint.postgres.sh | 28 | ||||
| -rwxr-xr-x | docker/init-invidious-db.sh | 12 |
4 files changed, 14 insertions, 34 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 4b78f3bc..0d842a98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,8 @@ services: restart: unless-stopped volumes: - postgresdata:/var/lib/postgresql/data + - ./config/sql:/config/sql + - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh environment: POSTGRES_DB: invidious POSTGRES_PASSWORD: kemal diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres index 19b04667..bb15f1dc 100644 --- a/docker/Dockerfile.postgres +++ b/docker/Dockerfile.postgres @@ -3,9 +3,3 @@ FROM postgres:10 # Do not require a PostgreSQL superuser password. # See https://github.com/docker-library/postgres/issues/681. ENV POSTGRES_HOST_AUTH_METHOD trust - -ADD ./config/sql /config/sql -ADD ./docker/entrypoint.postgres.sh /entrypoint.sh - -ENTRYPOINT [ "/entrypoint.sh" ] -CMD [ "postgres" ] diff --git a/docker/entrypoint.postgres.sh b/docker/entrypoint.postgres.sh deleted file mode 100755 index 13f6ea7d..00000000 --- a/docker/entrypoint.postgres.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -CMD="$@" -if [ ! -f /var/lib/postgresql/data/setupFinished ]; then - echo "### first run - setting up invidious database" - /usr/local/bin/docker-entrypoint.sh postgres & - sleep 10 - until runuser -l postgres -c 'pg_isready' 2>/dev/null; do - >&2 echo "### Postgres is unavailable - waiting" - sleep 5 - done - >&2 echo "### importing table schemas" - su postgres -c 'psql invidious kemal < config/sql/channels.sql' - su postgres -c 'psql invidious kemal < config/sql/videos.sql' - su postgres -c 'psql invidious kemal < config/sql/channel_videos.sql' - su postgres -c 'psql invidious kemal < config/sql/users.sql' - su postgres -c 'psql invidious kemal < config/sql/session_ids.sql' - su postgres -c 'psql invidious kemal < config/sql/nonces.sql' - su postgres -c 'psql invidious kemal < config/sql/annotations.sql' - su postgres -c 'psql invidious kemal < config/sql/playlists.sql' - su postgres -c 'psql invidious kemal < config/sql/playlist_videos.sql' - touch /var/lib/postgresql/data/setupFinished - echo "### invidious database setup finished" - exit -fi - -echo "running postgres /usr/local/bin/docker-entrypoint.sh $CMD" -exec /usr/local/bin/docker-entrypoint.sh $CMD diff --git a/docker/init-invidious-db.sh b/docker/init-invidious-db.sh new file mode 100755 index 00000000..c07c7770 --- /dev/null +++ b/docker/init-invidious-db.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -eou pipefail + +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/channels.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/videos.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/channel_videos.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/users.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/session_ids.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/nonces.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/annotations.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlists.sql +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlist_videos.sql |