Merge branch 'main' of https://git.mapletree.email/admin_jk/mapletree

lxc1/p2-apps/forgejo.yml

@@ -1,6 +1,7 @@
 services:
   redis:
-    image: hub.mapletree.email/docker-hub/library/redis:alpine
+    #image: hub.mapletree.email/docker-hub/library/redis:alpine
+    image: alpine:latest
     restart: always
     networks:
       - fj_internal  # MUST match the network your Forgejo container is on
@@ -10,7 +11,8 @@ services:
       timeout: 5s
       retries: 5
   forgejo:
-    image: hub.mapletree.email/codeberg/forgejo/forgejo:9.0
+    #image: hub.mapletree.email/codeberg/forgejo/forgejo:9.0
+    image: codeberg.org/forgejo/forgejo:9
     container_name: fj-node${FJ_NODE_ID}
     restart: always
     environment:

lxc1/p2-apps/zot.yml

@@ -15,6 +15,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=zot_external"
+      - "traefik.http.routers.zot.entrypoints=websecure"
       - "traefik.http.routers.zot.rule=Host(`${ZOT_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}`)"
       - "traefik.http.routers.zot.tls=true"
       - "traefik.http.routers.zot.tls.certresolver=dns_resolver"