remove nginx

Author: leon-liang

client/.env.development

@@ -1,4 +1,4 @@
-NEXT_PUBLIC_API_URL=https://api.teamserverdown.devops.aet.cit.tum.de
+NEXT_PUBLIC_API_URL=http://localhost:9001
 KEYCLOAK_CLIENT_ID=webclient
 KEYCLOAK_ISSUER=http://keycloak:8080/realms/development
 NEXTAUTH_URL=http://localhost:3000/api/auth/

client/src/app/api/auth/[...nextauth]/route.ts

@@ -87,6 +87,4 @@ const authOptions: NextAuthOptions = {
 };
 const handler = NextAuth(authOptions);
 
-console.log(authOptions.providers)
-
 export { handler as GET, handler as POST };

docker-compose.yml

@@ -1,33 +1,13 @@
 name: team-server-down
 
 services:
-  nginx:
-    restart: always
-    image: nginx:stable-alpine
-    healthcheck:
-      test: "curl -f http://localhost:80 || exit 1"
-      interval: 5s
-    volumes:
-      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - ./docker/nginx/cert.crt:/etc/nginx/cert.crt:ro
-      - ./docker/nginx/private.key:/etc/nginx/private.key:ro
-    depends_on:
-#      - server
-      - keycloak
-    ports:
-      - "80:80"
-      - "443:443"
-    networks:
-      - server
-
   keycloak:
     restart: always
     build:
       context: ./docker/keycloak
       dockerfile: Dockerfile
       target: development
     ports:
-      - "8443:8443"
       - "8080:8080"
     command:
       - start-dev
@@ -43,44 +23,42 @@ services:
       KC_DB_URL: jdbc:postgresql://db:5432/keycloak
       KC_DB_USERNAME: root
       KC_DB_PASSWORD: password
-      KC_HTTPS_CERTIFICATE_FILE: /opt/keycloak/conf/server.crt.pem
-      KC_HTTPS_CERTIFICATE_KEY_FILE: /opt/keycloak/conf/server.key.pem
       KC_HOSTNAME: localhost
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: password
+      KC_HTTP_ENABLED: true
+      KC_HOSTNAME_STRICT: false
     volumes:
       - ./docker/keycloak/realm-export.json:/opt/keycloak/data/import/realm-export.json:ro
-      - ./docker/keycloak/cert.crt:/opt/keycloak/conf/server.crt.pem:ro
-      - ./docker/keycloak/private.key:/opt/keycloak/conf/server.key.pem:ro
     networks:
       - server
 
-#  server:
-#    restart: always
-#    build:
-#      context: ./server
-#      dockerfile: Dockerfile
-#      target: development
-#    healthcheck:
-#      test: ["CMD", "curl", "-f", "http://server:8080/"]
-#      interval: 10s
-#      timeout: 3s
-#    environment:
-#      DB_HOST: ${DB_HOST:-db}
-#      DB_PORT: ${DB_PORT:-5432}
-#      DB_NAME: ${DB_NAME:-main}
-#      DB_USER: ${DB_USER:-root}
-#      DB_PASSWORD: ${DB_PASSWORD:-password}
-#      ALLOWED_ORIGIN: ${ALLOWED_ORIGIN:-https://teamserverdown.devops.aet.cit.tum.de}
-#    depends_on:
-#      db:
-#        condition: service_healthy
-#    ports:
-#      - "8080:8080"
-#    volumes:
-#      - ./server:/app
-#    networks:
-#      - server
+  server:
+    restart: always
+    build:
+      context: ./server
+      dockerfile: Dockerfile
+      target: development
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9001/"]
+      interval: 10s
+      timeout: 3s
+    environment:
+      DB_HOST: ${DB_HOST:-db}
+      DB_PORT: ${DB_PORT:-5432}
+      DB_NAME: ${DB_NAME:-main}
+      DB_USER: ${DB_USER:-root}
+      DB_PASSWORD: ${DB_PASSWORD:-password}
+      ALLOWED_ORIGIN: ${ALLOWED_ORIGIN:-http://localhost:3000}
+    depends_on:
+      db:
+        condition: service_healthy
+    ports:
+      - "9001:9001"
+    volumes:
+      - ./server:/app
+    networks:
+      - server
 
   client:
     restart: always

docker/keycloak/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:24.0.1 as development
+FROM quay.io/keycloak/keycloak:24.0.1 AS development
 
 ENV KC_HEALTH_ENABLED=true
 ENV KC_METRICS_ENABLED=true
@@ -9,8 +9,6 @@ FROM quay.io/keycloak/keycloak:24.0.1
 
 COPY --from=development /opt/keycloak/ /opt/keycloak/
 
-COPY ./server.crt.pem /opt/keycloak/conf/server.crt.pem
-COPY ./server.key.pem /opt/keycloak/conf/server.key.pem
 COPY ./realm-export.json /opt/keycloak/data/import/realm-export.json
 
 ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]

docker/keycloak/cert.crt

@@ -1,3 +1,6 @@
+server:
+  port: 9091
+
 spring:
   datasource:
     url: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}