Merge branch 'main' of https://git.mapletree.email/admin_jk/mapletree
Some checks are pending
PVE2 Infrastructure Deploy / terraform (push) Waiting to run

This commit is contained in:
admin_jk 2026-03-19 09:24:13 -06:00
commit 625f59ddb3
2 changed files with 5 additions and 2 deletions

View file

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

View file

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