From 6901d10d54c51f8e4038e6c6d850a86cecf2e885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 31 May 2020 09:57:33 +0200 Subject: [PATCH 1/5] Set magic ENV varialbes for user, default DB instead of doing it ourselves --- docker-compose.yml | 4 ++++ docker/Dockerfile.postgres | 1 - 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' From 0b52d52f4aee4484c272a7bce21b7286115234e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 31 May 2020 10:02:05 +0200 Subject: [PATCH 2/5] Use inbuilt init script --- docker-compose.yml | 2 ++ docker/Dockerfile.postgres | 6 ------ docker/entrypoint.postgres.sh | 28 ---------------------------- docker/init-invidious-db.sh | 12 ++++++++++++ 4 files changed, 14 insertions(+), 34 deletions(-) delete mode 100755 docker/entrypoint.postgres.sh create mode 100755 docker/init-invidious-db.sh 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 From 8ebfaed5465007fd67782e00ef343c99c8e9b7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 31 May 2020 10:04:55 +0200 Subject: [PATCH 3/5] Remove no longer needed POSTGRES_HOST_AUTH_METHOD --- docker-compose.yml | 2 +- docker/Dockerfile.postgres | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0d842a98..5ba551f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: POSTGRES_PASSWORD: kemal POSTGRES_USER: kemal healthcheck: - test: ["CMD", "pg_isready", "-U", "postgres"] + test: ["CMD", "pg_isready", "-U", "postgres"] invidious: build: context: . diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres index bb15f1dc..ab190f52 100644 --- a/docker/Dockerfile.postgres +++ b/docker/Dockerfile.postgres @@ -1,5 +1 @@ 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 From 7b2b19b4ba6402e74683ed2f7194a43cf9edc0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 31 May 2020 10:05:53 +0200 Subject: [PATCH 4/5] Remove empty Dockerfile --- docker-compose.yml | 4 +--- docker/Dockerfile.postgres | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 docker/Dockerfile.postgres diff --git a/docker-compose.yml b/docker-compose.yml index 5ba551f4..ffa24570 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,7 @@ version: '3' services: postgres: - build: - context: . - dockerfile: docker/Dockerfile.postgres + image: postgres:10 restart: unless-stopped volumes: - postgresdata:/var/lib/postgresql/data diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres deleted file mode 100644 index ab190f52..00000000 --- a/docker/Dockerfile.postgres +++ /dev/null @@ -1 +0,0 @@ -FROM postgres:10 From e16d951da059c1a82eba7532b8a28dc51bcb7e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Jun 2020 08:10:30 +0200 Subject: [PATCH 5/5] Create postgres user to avoid fatal warning --- docker/init-invidious-db.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/init-invidious-db.sh b/docker/init-invidious-db.sh index c07c7770..6c8ad3a7 100755 --- a/docker/init-invidious-db.sh +++ b/docker/init-invidious-db.sh @@ -1,6 +1,10 @@ #!/bin/sh set -eou pipefail +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL + CREATE USER postgres; +EOSQL + 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