Merge branch 'main' into fix/gitea-ssh

gitea/compose.yaml

@@ -26,14 +26,55 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik-proxy"
+
+      # Prod Router
+      - "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
+      - "traefik.http.routers.gitea.entrypoints=websecure"
+      - "traefik.http.routers.gitea.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea.service=gitea"
+      - "traefik.http.routers.gitea.tls=true"
+      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
+
+      # Local Router
+      - "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`) || Host(`gitea.internal`)"
+      - "traefik.http.routers.gitea-local.entrypoints=websecure"
+      - "traefik.http.routers.gitea-local.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea-local.service=gitea"
+      - "traefik.http.routers.gitea-local.tls=true"
+
+      # Dev Router
+      - "traefik.http.routers.gitea-dev.rule=Host(`gitea.gigaforust.internal`)"
+      - "traefik.http.routers.gitea-dev.entrypoints=websecure"
+      - "traefik.http.routers.gitea-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea-dev.service=gitea"
+      - "traefik.http.routers.gitea-dev.tls=true"
       - "traefik.tcp.routers.gitea.entrypoints=ssh"
       - "traefik.tcp.routers.gitea.rule=HostSNI(`*`)"
       - "traefik.tcp.services.gitea.loadbalancer.server.port=22"
-    # ports:
-    #   - "2221:22"
+    ports:
+      - "2221:22"
     depends_on:
       - db
-      
+
+  runner:
+    image: gitea/act_runner:0.2.11
+    container_name: gitea-runner
+    restart: always
+    depends_on:
+      - server
+    env_file:
+      - .env
+    networks:
+      - gitea-db
+    environment:
+      - GITEA_INSTANCE_URL=http://server:3000
+      - GITEA_RUNNER_REGISTRATION_TOKEN=${BASIC-RUNNER_TOKEN}
+      - GITEA_RUNNER_NAME=basic-runner
+      - GITEA_RUNNER_LABELS=docker:docker://node:20-bookworm,ubuntu-latest:docker://node:20-bookworm
+    volumes:
+      - ./gitea-runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+
   db:
     image: docker.io/library/postgres:14
     restart: always
@@ -45,7 +86,7 @@ services:
       - gitea-db
     volumes:
       - ./gitea-db/:/var/lib/postgresql/data
-      
+
 networks:
   gitea-db:
     external: false