Commit abf1a3ef authored by René Jochum's avatar René Jochum

Add use_http for all HTTP(s) containers.

parent e66127e3
......@@ -10,3 +10,4 @@ config/*
src/minadmin_auth_api/
.vscode/tags
......@@ -78,6 +78,10 @@ services:
# condition: on-failure
{% if dgraph.enable %}
{% set http = "" %}
{% if dgraph.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
dgraph-zero:
image: dgraph/dgraph:latest
environment:
......@@ -100,7 +104,7 @@ services:
- SERVICE_8080_CHECK_HTTP=/health
- SERVICE_8080_CHECK_INTERVAL=15s
- SERVICE_8080_CHECK_TIMEOUT=1s
- SERVICE_8080_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/dgraph-server,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/dgraph-server,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
volumes:
- ./dist/docker/dgraph/data:/dgraph:rw
networks:
......@@ -124,7 +128,7 @@ services:
- SERVICE_8000_CHECK_HTTP=/
- SERVICE_8000_CHECK_INTERVAL=15s
- SERVICE_8000_CHECK_TIMEOUT=1s
- SERVICE_8000_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8000,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/dgraph,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
- SERVICE_8000_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8000,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/dgraph,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
volumes:
- ./dist/docker/dgraph/data:/dgraph:rw
networks:
......@@ -197,6 +201,10 @@ services:
restart_policy:
condition: on-failure
{% set http = "" %}
{% if hydra.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
hydra:
build:
context: ./dist/docker/hydra
......@@ -221,7 +229,7 @@ services:
- SERVICE_4445_CHECK_HTTP=/health/ready
- SERVICE_4445_CHECK_INTERVAL=15s
- SERVICE_4445_CHECK_TIMEOUT=1s
- SERVICE_4444_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=4444,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/o,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
- SERVICE_4444_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=4444,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/o,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
- LOG_LEVEL={{ hydra.log_level }}
- OAUTH2_ISSUER_URL={{ minadmin.oidc.issuer_url }}
......@@ -318,6 +326,10 @@ services:
condition: none
{% endif %}
{% set http = "" %}
{% if minadmin_main.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
minadmin-main:
image: minadmin/minadmin_main:latest
volumes:
......@@ -330,7 +342,7 @@ services:
- SERVICE_8080_CHECK_HTTP=/health
- SERVICE_8080_CHECK_INTERVAL=15s
- SERVICE_8080_CHECK_TIMEOUT=1s
- SERVICE_8080_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }}
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }}
depends_on:
- consul
networks:
......@@ -359,6 +371,10 @@ services:
{% endif %}
{% if minadmin_auth.enable %}
{% set http = "" %}
{% if minadmin_auth.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
minadmin-auth:
image: minadmin/minadmin_auth:latest
volumes:
......@@ -370,7 +386,7 @@ services:
- MINADMIN_TEMPLATE_VIEWS_FOLDER=/web/views
- MINADMIN_TEMPLATE_DISABLE_CACHE={{ minadmin_auth.template.disable_cache }}
- SERVICE_NAME=minadmin-auth
- SERVICE_8080_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/
depends_on:
- consul
- minadmin-auth-srv
......@@ -399,6 +415,10 @@ services:
{% endif %}
{% if minadmin_api_v1_api.enable %}
{% set http = "" %}
{% if minadmin_api_v1_api.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
minadmin-api-v1-api:
image: minadmin/minadmin_api_v1:latest
entrypoint: minadmin_api_v1_api
......@@ -409,7 +429,7 @@ services:
- SERVICE_8080_CHECK_HTTP=/health
- SERVICE_8080_CHECK_INTERVAL=15s
- SERVICE_8080_CHECK_TIMEOUT=1s
- SERVICE_8080_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/api/v1,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/api/v1,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
depends_on:
- consul
networks:
......@@ -499,6 +519,10 @@ services:
condition: on-failure
{% endif %}
{% set http = "" %}
{% if traefik.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% endif %}
traefik:
build:
context: ./dist/docker/traefik
......@@ -509,7 +533,7 @@ services:
# - /var/run/docker.sock:/var/run/docker.sock
command: -c /etc/traefik/config/traefik.toml
environment:
- SERVICE_8080_TAGS=traefik.enable=true,traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/traefik,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/traefik,traefik.frontend.auth.basic.usersFile=/etc/traefik/admins.htpasswd
ports:
{% if traefik.expose_ports %}
- "8080:8080"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment