.gitea/workflows/build.yml

@@ -45,9 +45,9 @@ jobs:
       - name: Build Frontend (${{ env.TAG }})
         run: |
           if [ "$TAG" = "dev" ]; then
-            API_URL="http://t610:5005/api"
+            API_URL="https://hospitality-dev-api.theriise.net/api"
           else
-            API_URL="http://t610:5004/api"
+            API_URL="https://hospitality-api.theriise.net/api"
           fi
 
           docker build \

src/hospitality-web/deploy/docker-compose.dev.yml

@@ -4,6 +4,8 @@ networks:
   hospitality-dev-net:
     name: hospitality-dev-net
     driver: bridge
+  edge:
+    external: true
 
 services:
   db:
@@ -30,8 +32,13 @@ services:
       - db
     networks:
       - hospitality-dev-net
-    # ports:
+      - edge
-    #   - "5005:8080"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality-dev-api.rule=Host(`hospitality-dev-api.theriise.net`)"
+      - "traefik.http.routers.hospitality-dev-api.entrypoints=websecure"
+      - "traefik.http.routers.hospitality-dev-api.tls=true"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:dev
@@ -41,18 +48,13 @@ services:
       - api
     networks:
       - hospitality-dev-net
-    ports:
+      - edge
-      - "8085:80"
+    labels:
-    # Eller via Traefik, samme mønster som over:
+      - "traefik.enable=true"
-    # networks:
+      - "traefik.docker.network=edge"
-    #   - hospitality-dev-net
+      - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
-    #   - edge
+      - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
-    # labels:
+      - "traefik.http.routers.hospitality-dev.tls=true"
-    #   - "traefik.enable=true"
-    #   - "traefik.docker.network=edge"
-    #   - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
-    #   - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
-    #   - "traefik.http.routers.hospitality-dev.tls=true"
 
 volumes:
   hospitality-dev-db-data:

src/hospitality-web/deploy/docker-compose.prod.yml

@@ -4,6 +4,8 @@ networks:
   hospitality-net:
     name: hospitality-net
     driver: bridge
+  edge:
+    external: true
 
 services:
   db:
@@ -31,9 +33,13 @@ services:
       - db
     networks:
       - hospitality-net
-    # Hvis du vil nå API direkte uten Traefik:
+      - edge
-    # ports:
+    labels:
-    #   - "5004:8080"
+      - "traefik.enable=true"
+      - "traefik.docker.network=edge"
+      - "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)"
+      - "traefik.http.routers.hospitality-api.entrypoints=websecure"
+      - "traefik.http.routers.hospitality-api.tls=true"
 
   web:
     image: gitea.theriise.net/steinhelge/hospitality-frontend:latest
@@ -43,19 +49,13 @@ services:
       - api
     networks:
       - hospitality-net
-    # Ekstern tilgang (uten Traefik):
+      - edge
-    ports:
+    labels:
-      - "8084:80"
+      - "traefik.enable=true"
-    # Hvis du vil kjøre via Traefik i stedet:
+      - "traefik.docker.network=edge"
-    # networks:
+      - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
-    #   - hospitality-net
+      - "traefik.http.routers.hospitality.entrypoints=websecure"
-    #   - edge
+      - "traefik.http.routers.hospitality.tls=true"
-    # labels:
-    #   - "traefik.enable=true"
-    #   - "traefik.docker.network=edge"
-    #   - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
-    #   - "traefik.http.routers.hospitality.entrypoints=websecure"
-    #   - "traefik.http.routers.hospitality.tls=true"
 
 volumes:
   hospitality-db-data: