diff --git a/version-control/docker-compose.override.yml b/version-control/docker-compose.override.yml index d8763e8..10e1292 100644 --- a/version-control/docker-compose.override.yml +++ b/version-control/docker-compose.override.yml @@ -3,7 +3,7 @@ services: labels: net.unraid.docker.managed: 'composeman' net.unraid.docker.icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/gitea.png' - net.unraid.docker.webui: '' + net.unraid.docker.webui: 'https://${DOMAIN}' net.unraid.docker.shell: '' runner: labels: diff --git a/version-control/docker-compose.yml b/version-control/docker-compose.yml index 409a9fe..1d1bee8 100644 --- a/version-control/docker-compose.yml +++ b/version-control/docker-compose.yml @@ -1,14 +1,17 @@ services: gitea: - image: docker.gitea.com/gitea:1.24.5 + image: docker.gitea.com/gitea:1.26 container_name: gitea + networks: + - default + - pangolin environment: - USER_UID=1000 - USER_GID=1000 - - GITEA__server__DOMAIN=${GITEA__server__DOMAIN} - - GITEA__server__SSH_DOMAIN=${GITEA__server__SSH_DOMAIN} - - GITEA__server__ROOT_URL=${GITEA__server__ROOT_URL} + - GITEA__server__DOMAIN=${DOMAIN} + - GITEA__server__SSH_DOMAIN=${DOMAIN} + - GITEA__server__ROOT_URL="https://${DOMAIN}/" - GITEA__server__SSH_PORT=222 # external port users connect to - GITEA__server__SSH_LISTEN_PORT=22 # internal container port - GITEA__server__START_SSH_SERVER=false @@ -26,7 +29,6 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "6734:3000" - "222:22" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"] @@ -36,17 +38,37 @@ services: start_period: 20s labels: net.unraid.docker.icon: "https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/gitea.png" + net.unraid.docker.webui: "https://${DOMAIN}" folder.view2: "Services" + pangolin.public-resources.gitea-version-control.name: "${RESOURCE_NAME}" + pangolin.public-resources.gitea-version-control.full-domain: "${DOMAIN}" + pangolin.public-resources.gitea-version-control.protocol: "http" + + pangolin.public-resources.gitea-version-control.auth.sso-enabled: false + + pangolin.public-resources.gitea-version-control.targets[0].method: "http" + pangolin.public-resources.gitea-version-control.targets[0].hostname: "gitea" + pangolin.public-resources.gitea-version-control.targets[0].port: 3000 + + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.enabled: true + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.hostname: "gitea" + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.port: 3000 + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.path: "/api/healthz" + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.method: "GET" + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.status: 200 + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.interval: 30 + pangolin.public-resources.gitea-version-control.targets[0].healthcheck.timeout: 5 + # HOMEPAGE homepage.group: Development homepage.name: Gitea homepage.icon: gitea.png - homepage.href: https:gitea.homecube.org + homepage.href: "https://${DOMAIN}" homepage.description: Git server runner: - image: docker.io/gitea/act_runner:nightly + image: docker.io/gitea/act_runner:latest container_name: gitea-runner depends_on: gitea: @@ -63,3 +85,8 @@ services: labels: net.unraid.docker.icon: "https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/gitea.png" folder.view2: "Runners" + +networks: + pangolin: + name: pangolin_net + external: true