From 857308e6bad07068d6127bcc9a6eb1122cb40450 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Thu, 14 Nov 2019 12:34:55 -0500 Subject: [PATCH 1/7] Sticking to one env-var management system Starting with the Postgres container so that you only have to set overlapping environment variables in one place. --- support/docker/production/docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 3786ae675c5..6d61b07e241 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -47,10 +47,8 @@ services: postgres: image: postgres:10-alpine - environment: - POSTGRES_USER: ${PEERTUBE_DB_USERNAME} - POSTGRES_PASSWORD: ${PEERTUBE_DB_PASSWORD} - POSTGRES_DB: peertube + env_file: + - .env volumes: - ./docker-volume/db:/var/lib/postgresql/data restart: "always" From 19110c73a370bdb56036ff7ebee971f23efc82b4 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Thu, 14 Nov 2019 12:53:27 -0500 Subject: [PATCH 2/7] Moving Postfix envvars pt 1 --- support/docker/production/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 6d61b07e241..9f6c47eca38 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -65,8 +65,8 @@ services: postfix: image: mwader/postfix-relay - environment: - - POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME} + env_file: + - .env labels: traefik.enable: "false" restart: "always" From a44559f1079aa6d6ab86d682d1c26296014e9b98 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Thu, 14 Nov 2019 12:56:56 -0500 Subject: [PATCH 3/7] Moving Postfix envvars pt 2 .env file --- support/docker/production/.env | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/production/.env b/support/docker/production/.env index c8393d0ce80..b749fefa46d 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -14,6 +14,7 @@ PEERTUBE_SMTP_FROM=noreply@domain.tld PEERTUBE_SMTP_TLS=false PEERTUBE_SMTP_DISABLE_STARTTLS=false PEERTUBE_ADMIN_EMAIL=admin@domain.tld +POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME} # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ #PEERTUBE_SIGNUP_ENABLED=true #PEERTUBE_TRANSCODING_ENABLED=true From a409eae7da4ef45734553704a445e3018b0bef14 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Thu, 14 Nov 2019 13:41:56 -0500 Subject: [PATCH 4/7] Added missing envvars. --- support/docker/production/.env | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/support/docker/production/.env b/support/docker/production/.env index b749fefa46d..25de2880fad 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -1,5 +1,9 @@ -PEERTUBE_DB_USERNAME=postgres_user -PEERTUBE_DB_PASSWORD=postgres_password +POSTGRES_USER=peertube +POSTGRES_PASSWORD=peertube +POSTGRES_DB=peertube +PEERTUBE_DB_USERNAME=$(POSTGRES_USER) +PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD) +PEERTUBE_DB_HOSTNAME=172.18.0.3 PEERTUBE_WEBSERVER_HOSTNAME=domain.tld PEERTUBE_WEBSERVER_PORT=443 PEERTUBE_WEBSERVER_HTTPS=true From b64d3c3ac21c098c4f416def684701202a301b74 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Thu, 14 Nov 2019 13:43:31 -0500 Subject: [PATCH 5/7] Adding functioning glue Suggest something better if you wish. --- support/docker/production/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 9f6c47eca38..fb82e9f7a7c 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -54,6 +54,9 @@ services: restart: "always" labels: traefik.enable: "false" + networks: + default: + ipv4_address: 172.20.0.3 redis: image: redis:4-alpine From 4ef8783ac4520e2ae3c9073375a9aefa5e133929 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Fri, 15 Nov 2019 21:10:22 -0500 Subject: [PATCH 6/7] removed IP from example --- support/docker/production/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/docker/production/.env b/support/docker/production/.env index 25de2880fad..95ca42d6971 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env @@ -3,7 +3,7 @@ POSTGRES_PASSWORD=peertube POSTGRES_DB=peertube PEERTUBE_DB_USERNAME=$(POSTGRES_USER) PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD) -PEERTUBE_DB_HOSTNAME=172.18.0.3 +PEERTUBE_DB_HOSTNAME=postgres PEERTUBE_WEBSERVER_HOSTNAME=domain.tld PEERTUBE_WEBSERVER_PORT=443 PEERTUBE_WEBSERVER_HTTPS=true From 08d05bcc68a50e62afb5ce47a7ea46b0ae843233 Mon Sep 17 00:00:00 2001 From: Leopere <1068374+Leopere@users.noreply.github.com> Date: Fri, 15 Nov 2019 21:11:16 -0500 Subject: [PATCH 7/7] Removed default network from update. --- support/docker/production/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index fb82e9f7a7c..9f6c47eca38 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -54,9 +54,6 @@ services: restart: "always" labels: traefik.enable: "false" - networks: - default: - ipv4_address: 172.20.0.3 redis: image: redis:4-alpine