From 4c77908bb492e6d9ee567bd4c2b2fe78e63aae33 Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Thu, 24 Jan 2019 19:02:09 -0600 Subject: [PATCH] Update postgres entrypoint for docker image --- docker/Dockerfile.postgres | 1 - docker/entrypoint.postgres.sh | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres index 3186e050..720bdff8 100644 --- a/docker/Dockerfile.postgres +++ b/docker/Dockerfile.postgres @@ -2,7 +2,6 @@ FROM postgres:10 ENV POSTGRES_USER postgres -ADD ./setup.sh /setup.sh ADD ./config/sql /config/sql ADD ./docker/entrypoint.postgres.sh /entrypoint.sh diff --git a/docker/entrypoint.postgres.sh b/docker/entrypoint.postgres.sh index 2f3ae65f..9a258dd6 100755 --- a/docker/entrypoint.postgres.sh +++ b/docker/entrypoint.postgres.sh @@ -10,7 +10,14 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then sleep 5 done >&2 echo "### importing table schemas" - su postgres -c "/setup.sh" && touch /var/lib/postgresql/data/setupFinished + su postgres -c 'createdb invidious' + su postgres -c 'psql -c "CREATE USER kemal WITH PASSWORD '"'kemal'"'"' + su postgres -c 'psql invidious < config/sql/channels.sql' + su postgres -c 'psql invidious < config/sql/videos.sql' + su postgres -c 'psql invidious < config/sql/channel_videos.sql' + su postgres -c 'psql invidious < config/sql/users.sql' + su postgres -c 'psql invidious < config/sql/nonces.sql' + touch /var/lib/postgresql/data/setupFinished echo "### invidious database setup finished" exit fi