Merge

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>

roles/docker/templates/aya01/compose.yaml

@@ -93,6 +93,8 @@ services:
       - PUID={{puid}}
       - PGID={{pgid}}
       - TZ={{timezone}}
+    ports:
+      - "{{kuma_port}}:3001"
     volumes:
       - "{{ kuma_config }}:/app/data"
 
@@ -221,6 +223,8 @@ services:
       - PUID={{ puid }}
       - PGID={{ pgid}}
       - TZ={{ timezone }}
+    ports:
+      - "{{ tautulli_port }}:8181"
     volumes:
       - {{ tautulli_config}}:/config
 
@@ -412,8 +416,6 @@ services:
       - broker
     networks:
       - net
-    ports:
-      - "{{ paperless.port }}:{{ paperless.port }}"
     healthcheck:
       test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:{{ paperless.port }}"]
       interval: 30s
@@ -435,6 +437,51 @@ services:
       - "PAPERLESS_TIME_ZONE={{ timezone }}"
       - "PAPERLESS_OCR_LANGUAGE=deu"
 
+  {{ homarr.host }}:
+    container_name: {{ homarr.host }}
+    image: ghcr.io/ajnart/homarr:latest
+    restart: unless-stopped
+    depends_on:
+      - pihole
+    networks:
+      - net
+    volumes:
+      - {{ homarr.volumes.configs }}:/app/data/configs
+      - {{ homarr.volumes.icons }}:/app/public/icons
+
+
+  {{ gitea.host }}:
+    container_name: {{ gitea.host }}
+    image: gitea/gitea:1.20.5-rootless
+    restart: unless-stopped
+    depends_on:
+      - pihole
+    networks:
+      - net
+    volumes:
+      - {{ gitea.volumes.data }}:/var/lib/gitea
+      - {{ gitea.volumes.config }}:/etc/gitea
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "{{ gitea.ports.http }}:3000"
+      - "{{ gitea.ports.ssh }}:2222"
+
+
+  {{ gitea.runner.host }}:
+    container_name: {{ gitea.runner.host }}
+    image: gitea/act_runner:nightly
+    restart: unless-stopped
+    depends_on:
+      - {{ gitea.host }}
+    networks:
+      - net
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - "GITEA_INSTANCE_URL={{ gitea.url }}"
+      - "GITEA_RUNNER_REGISTRATION_TOKEN={{ gitea.runner.token }}"
+
 networks:
   zoneminder:
     driver: bridge