marvin/marvinblum
1
0
Fork 0
mirror of https://github.com/Kugelschieber/marvinblum.git synced 2026-01-18 06:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed docker-compose.

Browse Source
This commit is contained in:
Marvin Blum
2020-12-05 00:11:09 +01:00
committed by Marvin Blum
parent 89336f537d
commit 3212d8ff3b
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docker-compose.yml
View File

@@ -8,6 +8,7 @@ services:
networks: networks:
- traefik-internal - traefik-internal
command: command:
- "--api.dashboard=true"
- "--providers.docker=true" - "--providers.docker=true"
- "--providers.docker.exposedbydefault=false" - "--providers.docker.exposedbydefault=false"
- "--providers.docker.network=marvinblum_traefik-internal" - "--providers.docker.network=marvinblum_traefik-internal"
@@ -20,11 +21,19 @@ services:
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "8080:8080"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
- /root/marvinblum/letsencrypt:/letsencrypt - /root/marvinblum/letsencrypt:/letsencrypt
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.port=9999"
- "traefik.http.routers.traefik.entrypoints=websecure"
- "traefik.http.routers.traefik.rule=Host(`traefik.marvinblum.de`)"
- "traefik.http.routers.traefik.service=api@internal"
- "traefik.http.routers.traefik.tls.certresolver=tls-resolver"
- "traefik.http.routers.traefik.middlewares=traefik-auth"
- "traefik.http.middlewares.traefik-auth.basicauth.users=marvinblum:$$apr1$$u.IJozER$$DoY0zwzgAciDpPs4vZvxY/"
# Global redirection: http to https # Global redirection: http to https
- 'traefik.http.routers.http-catchall.rule=HostRegexp(`{host:(www\.)?.+}`)' - 'traefik.http.routers.http-catchall.rule=HostRegexp(`{host:(www\.)?.+}`)'
- "traefik.http.routers.http-catchall.entrypoints=web" - "traefik.http.routers.http-catchall.entrypoints=web"
@@ -45,25 +54,22 @@ services:
depends_on: depends_on:
- traefik - traefik
networks: networks:
- postgres_db-internal
- traefik-internal - traefik-internal
env_file: env_file:
- secrets.env - secrets.env
environment: environment:
MB_EMVI_CLIENT_ID: 3fBBn144yvSF9R3dPC8l MB_EMVI_CLIENT_ID: 3fBBn144yvSF9R3dPC8l
MB_EMVI_ORGA: marvin MB_EMVI_ORGA: marvin
export MB_PIRSCH_CLIENT_ID: gEb3pvgxZvZzFRlOTdMgPtyLvNYgeVKe MB_PIRSCH_CLIENT_ID: mkiAzI2ZGjGBv8fpwh1A09fCJ8G1YFgx
export MB_PIRSCH_HOSTNAME: marvinblum.de MB_PIRSCH_HOSTNAME: marvinblum.de
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.port=8888" - "traefik.port=8888"
- "traefik.http.routers.schnittfest.rule=Host(`marvinblum.de`) || Host(`www.marvinblum.de`)" - "traefik.http.routers.marvinblum.rule=Host(`marvinblum.de`) || Host(`www.marvinblum.de`)"
- "traefik.http.routers.schnittfest.entrypoints=websecure" - "traefik.http.routers.marvinblum.entrypoints=websecure"
- "traefik.http.routers.schnittfest.tls=true" - "traefik.http.routers.marvinblum.tls=true"
- "traefik.http.routers.schnittfest.tls.certresolver=tls-resolver" - "traefik.http.routers.marvinblum.tls.certresolver=tls-resolver"
networks: networks:
traefik-internal: traefik-internal:
driver: bridge driver: bridge
postgres_db-internal:
external: true