diff options
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.postgres | 1 | ||||
| -rwxr-xr-x | docker/entrypoint.postgres.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index d7b3fa91..4b78f3bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,10 @@ services: restart: unless-stopped volumes: - postgresdata:/var/lib/postgresql/data + environment: + POSTGRES_DB: invidious + POSTGRES_PASSWORD: kemal + POSTGRES_USER: kemal healthcheck: test: ["CMD", "pg_isready", "-U", "postgres"] invidious: diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres index 3b25b802..19b04667 100644 --- a/docker/Dockerfile.postgres +++ b/docker/Dockerfile.postgres @@ -1,6 +1,5 @@ FROM postgres:10 -ENV POSTGRES_USER postgres # Do not require a PostgreSQL superuser password. # See https://github.com/docker-library/postgres/issues/681. ENV POSTGRES_HOST_AUTH_METHOD trust diff --git a/docker/entrypoint.postgres.sh b/docker/entrypoint.postgres.sh index be6f6782..13f6ea7d 100755 --- a/docker/entrypoint.postgres.sh +++ b/docker/entrypoint.postgres.sh @@ -10,8 +10,6 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then sleep 5 done >&2 echo "### importing table schemas" - su postgres -c 'createdb invidious' - su postgres -c 'psql -c "CREATE USER kemal WITH PASSWORD '"'kemal'"'"' 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' |