From 8b7cd62c57fee1f374f81ee4a5c4e06492986115 Mon Sep 17 00:00:00 2001
From: Diego Enriquez-Serrano <diego@diegoenriquezserrano.dev>
Date: Tue, 19 May 2026 10:16:16 -0600
Subject: [PATCH 1/2] Update forgejo template; bumps Forgejo version to 15;
 fixes git push over ssh

---
 blueprints/forgejo/docker-compose.yml | 22 +++++++++++++---------
 blueprints/forgejo/template.toml      |  2 +-
 meta.json                             |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/blueprints/forgejo/docker-compose.yml b/blueprints/forgejo/docker-compose.yml
index 36733c6ea..33923f2a6 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,20 @@ services:
       - FORGEJO__database__NAME=forgejo
       - FORGEJO__database__USER=forgejo
       - FORGEJO__database__PASSWD=forgejo
+      - FORGEJO__server__DOMAIN=${FORGEJO_DOMAIN}
+      - FORGEJO__server__SSH_DOMAIN=${FORGEJO_DOMAIN}
+      - FORGEJO__server__ROOT_URL=https://${FORGEJO_DOMAIN}/
+      - FORGEJO__server__SSH_PORT=2222
+      - FORGEJO__server__SSH_LISTEN_PORT=22
     restart: always
-
+    ports:
+      ## Avoids conflicting with host ssh server.
+      ## Make sure port 2222 is open to connections on host machine.
+      - "2222: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 +32,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/template.toml b/blueprints/forgejo/template.toml
index 56f45c181..2a621f7bf 100644
--- a/blueprints/forgejo/template.toml
+++ b/blueprints/forgejo/template.toml
@@ -2,7 +2,7 @@
 main_domain = "${domain}"
 
 [config]
-env = ["USER_UID=1000", "USER_GID=1000"]
+env = ["USER_UID=1000", "USER_GID=1000", "FORGEJO_DOMAIN=${main_domain}"]
 mounts = []
 
 [[config.domains]]
diff --git a/meta.json b/meta.json
index 8be7825d7..540202321 100644
--- a/meta.json
+++ b/meta.json
@@ -2494,7 +2494,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": {

From bedd98c6ba68de35391610b1fd50af03e06e5e5a Mon Sep 17 00:00:00 2001
From: Diego Enriquez-Serrano <diego@diegoenriquezserrano.dev>
Date: Tue, 19 May 2026 12:16:18 -0600
Subject: [PATCH 2/2] updates template compose and toml to use internal port
 mapping

---
 blueprints/forgejo/docker-compose.yml |  9 ++++-----
 blueprints/forgejo/template.toml      | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/blueprints/forgejo/docker-compose.yml b/blueprints/forgejo/docker-compose.yml
index 33923f2a6..e95158861 100644
--- a/blueprints/forgejo/docker-compose.yml
+++ b/blueprints/forgejo/docker-compose.yml
@@ -12,15 +12,14 @@ services:
       - FORGEJO__database__USER=forgejo
       - FORGEJO__database__PASSWD=forgejo
       - FORGEJO__server__DOMAIN=${FORGEJO_DOMAIN}
-      - FORGEJO__server__SSH_DOMAIN=${FORGEJO_DOMAIN}
+      - FORGEJO__server__SSH_DOMAIN=${FORGEJO_SSH_DOMAIN}
       - FORGEJO__server__ROOT_URL=https://${FORGEJO_DOMAIN}/
-      - FORGEJO__server__SSH_PORT=2222
+      - FORGEJO__server__SSH_PORT=
       - FORGEJO__server__SSH_LISTEN_PORT=22
     restart: always
     ports:
-      ## Avoids conflicting with host ssh server.
-      ## Make sure port 2222 is open to connections on host machine.
-      - "2222:22"
+      - 3000
+      - 22
     volumes:
       - forgejo_server:/data
       - /etc/timezone:/etc/timezone:ro
diff --git a/blueprints/forgejo/template.toml b/blueprints/forgejo/template.toml
index 2a621f7bf..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", "FORGEJO_DOMAIN=${main_domain}"]
+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}"