3 files changed, 7 insertions, 5 deletions

diff --git a/support/docker/production/.env b/support/docker/production/.env
index 9edc183b6..51c4e0ace 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -1,5 +1,5 @@
-DB_USERNAME=postgres_user
-DB_PASSWORD=postgres_password
+PEERTUBE_DB_USERNAME=postgres_user
+PEERTUBE_DB_PASSWORD=postgres_password
 PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index ddac23c4e..4970bbcca 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -18,7 +18,7 @@ trust_proxy:
 
 # Your database name will be "peertube"+database.suffix
 database:
-  hostname: 'db'
+  hostname: 'postgres'
   port: 5432
   suffix: ''
   username: 'postgres'
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 5b8f5700a..220c19fba 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -21,6 +21,8 @@ services:
     #   context: .
     #   dockerfile: ./support/docker/production/Dockerfile.stretch
     image: chocobozzz/peertube:production-stretch
+    env_file:
+      - .env
     # Traefik labels are suggested as an example for people using Traefik,
     # remove them if you are using another reverse proxy.
     labels:
@@ -41,8 +43,8 @@ services:
   postgres:
     image: postgres:10-alpine
     environment:
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${PEERTUBE_DB_USERNAME}
+      POSTGRES_PASSWORD: ${PEERTUBE_DB_PASSWORD}
       POSTGRES_DB: peertube
     volumes:
       - ./docker-volume/db:/var/lib/postgresql/data