Update docker files for new ldap

This commit is contained in:
Götz 2019-05-15 00:12:36 +02:00
parent 66d8613c19
commit 299817fc61
2 changed files with 7 additions and 36 deletions

View File

@ -2,12 +2,9 @@ version: "3"
networks: networks:
pg_db: pg_db:
internal: true external: false
ldap_net: ldap_net:
internal: true external: false
frontend_net:
external: true
services: services:
lama: lama:
@ -16,7 +13,6 @@ services:
context: docker/lama context: docker/lama
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
networks: networks:
- frontend_net
- ldap_net - ldap_net
- pg_db - pg_db
env_file: env_file:
@ -26,13 +22,9 @@ services:
depends_on: depends_on:
- dblama - dblama
- ldap - ldap
- traefik ports:
labels: - 0.0.0.0:8888:80
- "traefik.port=80"
- "traefik.enable=true"
- "traefik.frontend.rule=Host:lama.localhost"
- "traefik.docker.network=frontend_net"
dblama: dblama:
image: postgres:11.2-alpine image: postgres:11.2-alpine
networks: networks:
@ -60,28 +52,7 @@ services:
dockerfile: Dockerfile.admin dockerfile: Dockerfile.admin
networks: networks:
- ldap_net - ldap_net
- frontend_net
depends_on: depends_on:
- traefik
- ldap - ldap
labels:
- "traefik.port=80"
- "traefik.enable=true"
- "traefik.frontend.rule=Host:ldap.localhost"
- "traefik.docker.network=frontend_net"
traefik:
image: traefik:v1.7.9-alpine
command: --api --docker --docker.watch --docker.exposedByDefault=false
ports: ports:
- 80:80 - 0.0.0.0:8080:80
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./docker/traefik/traefik.toml:/etc/traefik/traefik.toml
networks:
- frontend_net
labels:
- "traefik.port=8080"
- "traefik.enable=true"
- "traefik.frontend.rule=Host:traefik.localhost"
- "traefik.docker.network=frontend_net"

View File

@ -4,7 +4,7 @@ DOMAIN=localhost
SITE_NAME=LAMa SITE_NAME=LAMa
SECRET_KEY=supersecret SECRET_KEY=supersecret
ALLOWED_HOSTS=lama lama.localhost ALLOWED_HOSTS=localhost
DATABASE_HOST=dblama DATABASE_HOST=dblama
DATABASE_PORT=5432 DATABASE_PORT=5432