Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix stopping webserver container timeout

Chocobozzz2e56f31b954e
diff --git a/support/docker/production/Dockerfile.nginx b/support/docker/production/Dockerfile.nginx
index c559b25368..a65d70f920 100644
--- a/support/docker/production/Dockerfile.nginx
+++ b/support/docker/production/Dockerfile.nginx
@@ -1,8 +1,6 @@
FROM nginx:alpine
-COPY ./support/docker/production/entrypoint.nginx.sh .
-RUN chmod +x entrypoint.nginx.sh
+COPY ./support/docker/production/entrypoint.nginx.sh /docker-entrypoint.d/99-entrypoint.nginx.sh
+RUN chmod +x /docker-entrypoint.d/99-entrypoint.nginx.sh
EXPOSE 80 443
-ENTRYPOINT []
-CMD ["/bin/sh", "entrypoint.nginx.sh"]
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 57a6c9ecb7..7bfece32dd 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -39,6 +39,21 @@ services:
depends_on:
- webserver
+ # You can comment this webserver-reloader section if you want to use another webserver/proxy or test PeerTube in local
+ webserver-reloader:
+ image: alpine:latest
+ command: >
+ sh -c "trap exit TERM;
+ while :; do
+ sleep 21600 & wait $$!;
+ echo 'Sending reload signal to webserver...';
+ kill -HUP 1;
+ done"
+ pid: "service:webserver"
+ depends_on:
+ - webserver
+ restart: "always"
+
peertube:
# If you don't want to use the official image and build one from sources:
# build:
diff --git a/support/docker/production/entrypoint.nginx.sh b/support/docker/production/entrypoint.nginx.sh
index 5f6a0a4a29..37d0bebead 100644
--- a/support/docker/production/entrypoint.nginx.sh
+++ b/support/docker/production/entrypoint.nginx.sh
@@ -8,10 +8,3 @@ export WEBSERVER_HOST="$PEERTUBE_WEBSERVER_HOSTNAME"
export PEERTUBE_HOST="peertube:9000"
envsubst '${WEBSERVER_HOST} ${PEERTUBE_HOST}' < $SOURCE_FILE > $TARGET_FILE
-
-while :; do
- sleep 12h & wait $!;
- nginx -s reload;
-done &
-
-exec nginx -g 'daemon off;'