aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-14 10:13:17 +0200
committerChocobozzz <me@florianbigard.com>2018-08-14 10:13:17 +0200
commit08c11bec43987364e83246e4e76958f5ccf89fe8 (patch)
tree73dc9168b028e9ff32071874557c62f6d3cf4b8a
parente5e7f7fe99bd0e8d6f3fa0b8ae8cf255ecaa6bf3 (diff)
downloadPeerTube-08c11bec43987364e83246e4e76958f5ccf89fe8.tar.gz
PeerTube-08c11bec43987364e83246e4e76958f5ccf89fe8.tar.zst
PeerTube-08c11bec43987364e83246e4e76958f5ccf89fe8.zip
Fix docker env file
-rw-r--r--support/docker/production/.env4
-rw-r--r--support/docker/production/config/production.yaml2
-rw-r--r--support/docker/production/docker-compose.yml6
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 @@
1DB_USERNAME=postgres_user 1PEERTUBE_DB_USERNAME=postgres_user
2DB_PASSWORD=postgres_password 2PEERTUBE_DB_PASSWORD=postgres_password
3PEERTUBE_WEBSERVER_HOSTNAME=domain.tld 3PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
4PEERTUBE_WEBSERVER_PORT=443 4PEERTUBE_WEBSERVER_PORT=443
5PEERTUBE_WEBSERVER_HTTPS=true 5PEERTUBE_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:
18 18
19# Your database name will be "peertube"+database.suffix 19# Your database name will be "peertube"+database.suffix
20database: 20database:
21 hostname: 'db' 21 hostname: 'postgres'
22 port: 5432 22 port: 5432
23 suffix: '' 23 suffix: ''
24 username: 'postgres' 24 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:
21 # context: . 21 # context: .
22 # dockerfile: ./support/docker/production/Dockerfile.stretch 22 # dockerfile: ./support/docker/production/Dockerfile.stretch
23 image: chocobozzz/peertube:production-stretch 23 image: chocobozzz/peertube:production-stretch
24 env_file:
25 - .env
24 # Traefik labels are suggested as an example for people using Traefik, 26 # Traefik labels are suggested as an example for people using Traefik,
25 # remove them if you are using another reverse proxy. 27 # remove them if you are using another reverse proxy.
26 labels: 28 labels:
@@ -41,8 +43,8 @@ services:
41 postgres: 43 postgres:
42 image: postgres:10-alpine 44 image: postgres:10-alpine
43 environment: 45 environment:
44 POSTGRES_USER: ${DB_USERNAME} 46 POSTGRES_USER: ${PEERTUBE_DB_USERNAME}
45 POSTGRES_PASSWORD: ${DB_PASSWORD} 47 POSTGRES_PASSWORD: ${PEERTUBE_DB_PASSWORD}
46 POSTGRES_DB: peertube 48 POSTGRES_DB: peertube
47 volumes: 49 volumes:
48 - ./docker-volume/db:/var/lib/postgresql/data 50 - ./docker-volume/db:/var/lib/postgresql/data