summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2020-05-31 09:57:33 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2020-07-25 21:51:39 +0200
commit6901d10d54c51f8e4038e6c6d850a86cecf2e885 (patch)
tree26e91533c7b291b8507431a97250da391809378a /docker
parent7caa2ae9bccd84bfc2460462f48c5d02ba060a8b (diff)
downloadinvidious-6901d10d54c51f8e4038e6c6d850a86cecf2e885.tar.gz
invidious-6901d10d54c51f8e4038e6c6d850a86cecf2e885.tar.bz2
invidious-6901d10d54c51f8e4038e6c6d850a86cecf2e885.zip
Set magic ENV varialbes for user, default DB
instead of doing it ourselves
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.postgres1
-rwxr-xr-xdocker/entrypoint.postgres.sh2
2 files changed, 0 insertions, 3 deletions
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'