From 4244bffdb3a8bb24e97f4dedd5b25c43010d8500 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Sun, 13 Jun 2021 12:09:05 +0200
Subject: [PATCH] Drop nginx

---
 compose.yml | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/compose.yml b/compose.yml
index c555d26..67db3fc 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,27 +2,6 @@
 version: "3.8"
 
 services:
-  web:
-    image: nginx:1.21.0
-    environment:
-      - STACK_NAME=${STACK_NAME}
-      - DOMAIN=${DOMAIN}
-    configs:
-      - source: nginx_conf
-        target: /etc/nginx/nginx.conf
-    networks:
-      - proxy
-      - internal
-    deploy:
-      update_config:
-        failure_action: rollback
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.kcp.loadbalancer.server.port=80"
-        - "traefik.http.routers.kcp.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.kcp.entrypoints=web-secure"
-        - "traefik.http.routers.kcp.tls.certresolver=production"
-
   app:
     image: "decentral1se/keycloak-collective-portal:latest"
     environment:
@@ -35,12 +14,21 @@ services:
       - app_secret_key
       - keycloak_client_secret
     networks:
-      - internal
+      - proxy
     configs:
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
         mode: 0555
     entrypoint: /usr/local/bin/entrypoint.sh
+    deploy:
+      update_config:
+        failure_action: rollback
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.kcp.loadbalancer.server.port=8000"
+        - "traefik.http.routers.kcp.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.kcp.entrypoints=web-secure"
+        - "traefik.http.routers.kcp.tls.certresolver=production"
     command: |
       uvicorn
       --host 0.0.0.0
@@ -51,14 +39,8 @@ services:
 networks:
   proxy:
     external: true
-  internal:
-    internal: true
 
 configs:
-  nginx_conf:
-    name: ${STACK_NAME}_nginx_conf_${NGINX_CONF_VERSION}
-    file: nginx.conf.tmpl
-    template_driver: golang
   entrypoint_sh:
     name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
     file: entrypoint.sh.tmpl