diff options
Diffstat (limited to 'support/docker')
-rw-r--r-- | support/docker/production/config/traefik.toml | 5 | ||||
-rw-r--r-- | support/docker/production/docker-compose.yml | 10 | ||||
-rw-r--r-- | support/docker/production/entrypoint.nginx.sh | 2 |
3 files changed, 5 insertions, 12 deletions
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" | |||
61 | # | 61 | # |
62 | # Required | 62 | # Required |
63 | # | 63 | # |
64 | entryPoint = "http" \ No newline at end of file | 64 | entryPoint = "http" |
65 | |||
66 | [docker] | ||
67 | 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: | |||
68 | - redis | 68 | - redis |
69 | - postfix | 69 | - postfix |
70 | restart: "always" | 70 | restart: "always" |
71 | labels: | ||
72 | traefik.enable: "false" | ||
73 | 71 | ||
74 | postgres: | 72 | postgres: |
75 | image: postgres:10-alpine | 73 | image: postgres:12-alpine |
76 | env_file: | 74 | env_file: |
77 | - .env | 75 | - .env |
78 | volumes: | 76 | volumes: |
79 | - ./docker-volume/db:/var/lib/postgresql/data | 77 | - ./docker-volume/db:/var/lib/postgresql/data |
80 | restart: "always" | 78 | restart: "always" |
81 | labels: | ||
82 | traefik.enable: "false" | ||
83 | 79 | ||
84 | redis: | 80 | redis: |
85 | image: redis:5-alpine | 81 | image: redis:5-alpine |
86 | volumes: | 82 | volumes: |
87 | - ./docker-volume/redis:/data | 83 | - ./docker-volume/redis:/data |
88 | restart: "always" | 84 | restart: "always" |
89 | labels: | ||
90 | traefik.enable: "false" | ||
91 | 85 | ||
92 | postfix: | 86 | postfix: |
93 | image: mwader/postfix-relay | 87 | image: mwader/postfix-relay |
@@ -95,8 +89,6 @@ services: | |||
95 | - .env | 89 | - .env |
96 | volumes: | 90 | volumes: |
97 | - ./docker-volume/opendkim/keys:/etc/opendkim/keys | 91 | - ./docker-volume/opendkim/keys:/etc/opendkim/keys |
98 | labels: | ||
99 | traefik.enable: "false" | ||
100 | restart: "always" | 92 | restart: "always" |
101 | 93 | ||
102 | networks: | 94 | 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 | |||
12 | # Remove HTTPS/SSL from nginx conf | 12 | # Remove HTTPS/SSL from nginx conf |
13 | sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET | 13 | sed -i 's/443 ssl http2/80/g;/ssl_/d' $TARGET |
14 | 14 | ||
15 | cat $TARGET | ||
16 | |||
17 | nginx -g "daemon off;" \ No newline at end of file | 15 | nginx -g "daemon off;" \ No newline at end of file |