Update docker files for new ldap

docker-compose.yml

@@ -2,12 +2,9 @@ version: "3"
 
 networks:
   pg_db:
-    internal: true
+    external: false
   ldap_net:
-    internal: true
+    external: false
-  frontend_net:
-    external: true
-
 
 services:
   lama:
@@ -16,7 +13,6 @@ services:
       context: docker/lama
       dockerfile: Dockerfile.dev
     networks:
-      - frontend_net
       - ldap_net
       - pg_db
     env_file:
@@ -26,12 +22,8 @@ services:
     depends_on:
       - dblama
       - 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:
     image: postgres:11.2-alpine
@@ -60,28 +52,7 @@ services:
       dockerfile: Dockerfile.admin
     networks:
       - ldap_net
-      - frontend_net
     depends_on:
-      - traefik
       - 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:
-      - 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"

docker/lama/dev.env

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