diff --git a/blueprints/forgejo/docker-compose.yml b/blueprints/forgejo/docker-compose.yml index 36733c6ea..e95158861 100644 --- a/blueprints/forgejo/docker-compose.yml +++ b/blueprints/forgejo/docker-compose.yml @@ -1,7 +1,8 @@ -version: "3.8" services: forgejo: - image: codeberg.org/forgejo/forgejo:10 + image: codeberg.org/forgejo/forgejo:15 + depends_on: + - db environment: - USER_UID=${USER_UID} - USER_GID=${USER_GID} @@ -10,15 +11,19 @@ services: - FORGEJO__database__NAME=forgejo - FORGEJO__database__USER=forgejo - FORGEJO__database__PASSWD=forgejo + - FORGEJO__server__DOMAIN=${FORGEJO_DOMAIN} + - FORGEJO__server__SSH_DOMAIN=${FORGEJO_SSH_DOMAIN} + - FORGEJO__server__ROOT_URL=https://${FORGEJO_DOMAIN}/ + - FORGEJO__server__SSH_PORT= + - FORGEJO__server__SSH_LISTEN_PORT=22 restart: always - + ports: + - 3000 + - 22 volumes: - forgejo_server:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - depends_on: - - db - db: image: postgres:17 restart: always @@ -26,12 +31,10 @@ services: - POSTGRES_USER=forgejo - POSTGRES_PASSWORD=forgejo - POSTGRES_DB=forgejo - volumes: - forgejo_db:/var/lib/postgresql/data - volumes: forgejo_db: driver: local forgejo_server: - driver: local \ No newline at end of file + driver: local diff --git a/blueprints/forgejo/meta.json b/blueprints/forgejo/meta.json index f7de1ab4a..22359aa04 100644 --- a/blueprints/forgejo/meta.json +++ b/blueprints/forgejo/meta.json @@ -1,7 +1,7 @@ { "id": "forgejo", "name": "Forgejo", - "version": "10", + "version": "15", "description": "Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job", "logo": "forgejo.svg", "links": { diff --git a/blueprints/forgejo/template.toml b/blueprints/forgejo/template.toml index 56f45c181..2f0d8491c 100644 --- a/blueprints/forgejo/template.toml +++ b/blueprints/forgejo/template.toml @@ -1,11 +1,25 @@ [variables] main_domain = "${domain}" +ssh_domain = "${domain}" [config] -env = ["USER_UID=1000", "USER_GID=1000"] +env = [ + "USER_UID=1000", + "USER_GID=1000", + "FORGEJO_DOMAIN=${main_domain}", + "FORGEJO_SSH_DOMAIN=${ssh_domain}", + "", + "## SET THE API URL IN CONSOLE CONFIG BY CLICKING THE COG", + "## FORGEJO_SSH_DOMAIN: ${ssh_domain}" +] mounts = [] [[config.domains]] serviceName = "forgejo" port = 3_000 host = "${main_domain}" + +[[config.domains]] +serviceName = "forgejo" +port = 22 +host = "${ssh_domain}"