From e604efcb71ca3bbff701598969d055d688161985 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 6 Mar 2020 10:59:11 +0100
Subject: Do not expose containers by default in traefik

---
 support/docker/production/config/traefik.toml |  5 ++++-
 support/docker/production/docker-compose.yml  | 10 +---------
 support/docker/production/entrypoint.nginx.sh |  2 --
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'support/docker')

diff --git a/support/docker/production/config/traefik.toml b/support/docker/production/config/traefik.toml
index d2437fdf8..c0a7cf840 100644
--- a/support/docker/production/config/traefik.toml
+++ b/support/docker/production/config/traefik.toml
@@ -61,4 +61,7 @@ entryPoint = "https"
   #
   # Required
   #
-  entryPoint = "http"
\ No newline at end of file
+  entryPoint = "http"
+
+[docker]
+  exposedByDefault = false
\ No newline at end of file
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 62be02467..51de964e8 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -68,26 +68,20 @@ services:
       - redis
       - postfix
     restart: "always"
-    labels:
-      traefik.enable: "false"
 
   postgres:
-    image: postgres:10-alpine
+    image: postgres:12-alpine
     env_file:
       - .env
     volumes:
       - ./docker-volume/db:/var/lib/postgresql/data
     restart: "always"
-    labels:
-      traefik.enable: "false"
 
   redis:
     image: redis:5-alpine
     volumes:
       - ./docker-volume/redis:/data
     restart: "always"
-    labels:
-      traefik.enable: "false"
 
   postfix:
     image: mwader/postfix-relay
@@ -95,8 +89,6 @@ services:
       - .env
     volumes:
       - ./docker-volume/opendkim/keys:/etc/opendkim/keys
-    labels:
-      traefik.enable: "false"
     restart: "always"
 
 networks:
diff --git a/support/docker/production/entrypoint.nginx.sh b/support/docker/production/entrypoint.nginx.sh
index 744385ec8..903806936 100644
--- a/support/docker/production/entrypoint.nginx.sh
+++ b/support/docker/production/entrypoint.nginx.sh
@@ -12,6 +12,4 @@ envsubst '${WEBSERVER_HOST} ${PEERTUBE_HOST}' < $SOURCE > $TARGET
 # Remove HTTPS/SSL from nginx conf
 sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET
 
-cat $TARGET
-
 nginx -g "daemon off;"
\ No newline at end of file
-- 
cgit v1.2.3