From ec3916bb7e7636ea3081a67f92c5f61e3eb4fafc Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:15:47 +0200
Subject: [PATCH] fix forjo

---
 templates/compose/forgejo-with-mysql.yaml                | 5 +++--
 templates/compose/forgejo-with-postgresql.yaml           | 5 +++--
 templates/compose/forgejo-with-runner-with-mariadb.yaml  | 9 ++++-----
 templates/compose/forgejo-with-runner-with-mysql.yaml    | 9 ++++-----
 .../compose/forgejo-with-runner-with-postgresql.yaml     | 9 ++++-----
 templates/compose/forgejo-with-runner.yaml               | 1 -
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/templates/compose/forgejo-with-mysql.yaml b/templates/compose/forgejo-with-mysql.yaml
index 9b2359c08..9a4cd4526 100644
--- a/templates/compose/forgejo-with-mysql.yaml
+++ b/templates/compose/forgejo-with-mysql.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, mysql
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-postgresql.yaml b/templates/compose/forgejo-with-postgresql.yaml
index 2a7596074..83c5d85db 100644
--- a/templates/compose/forgejo-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-postgresql.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, postgresql
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-runner-with-mariadb.yaml b/templates/compose/forgejo-with-runner-with-mariadb.yaml
index a751ee284..37ce6feb6 100644
--- a/templates/compose/forgejo-with-runner-with-mariadb.yaml
+++ b/templates/compose/forgejo-with-runner-with-mariadb.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, runner, mariadb, actions, cicd, ci
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
@@ -63,7 +64,6 @@ services:
     image: docker:dind
     hostname: docker
     privileged: true
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "dockerd"]
       interval: 10s
@@ -125,7 +125,6 @@ services:
       - forgejo-did-certs:/certs
       - forgejo-timezone:/etc/timezone:ro
       - forgejo-localtime:/etc/localtime:ro
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "forgejo-runner"]
       interval: 10s
@@ -134,4 +133,4 @@ services:
     command: >-
       bash -c '
       while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
-      '
\ No newline at end of file
+      '
diff --git a/templates/compose/forgejo-with-runner-with-mysql.yaml b/templates/compose/forgejo-with-runner-with-mysql.yaml
index ccc33644f..a5d35448f 100644
--- a/templates/compose/forgejo-with-runner-with-mysql.yaml
+++ b/templates/compose/forgejo-with-runner-with-mysql.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, runner, mysql, actions, cicd, ci
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
@@ -63,7 +64,6 @@ services:
     image: docker:dind
     hostname: docker
     privileged: true
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "dockerd"]
       interval: 10s
@@ -125,7 +125,6 @@ services:
       - forgejo-did-certs:/certs
       - forgejo-timezone:/etc/timezone:ro
       - forgejo-localtime:/etc/localtime:ro
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "forgejo-runner"]
       interval: 10s
@@ -134,4 +133,4 @@ services:
     command: >-
       bash -c '
       while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
-      '
\ No newline at end of file
+      '
diff --git a/templates/compose/forgejo-with-runner-with-postgresql.yaml b/templates/compose/forgejo-with-runner-with-postgresql.yaml
index 0b4dcd3fe..19a5014c5 100644
--- a/templates/compose/forgejo-with-runner-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-runner-with-postgresql.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, runner, postresql, actions, cicd, ci
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
@@ -62,7 +63,6 @@ services:
     image: docker:dind
     hostname: docker
     privileged: true
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "dockerd"]
       interval: 10s
@@ -124,7 +124,6 @@ services:
       - forgejo-did-certs:/certs
       - forgejo-timezone:/etc/timezone:ro
       - forgejo-localtime:/etc/localtime:ro
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "forgejo-runner"]
       interval: 10s
@@ -133,4 +132,4 @@ services:
     command: >-
       bash -c '
       while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
-      '
\ No newline at end of file
+      '
diff --git a/templates/compose/forgejo-with-runner.yaml b/templates/compose/forgejo-with-runner.yaml
index 66681810f..8ef53cefb 100644
--- a/templates/compose/forgejo-with-runner.yaml
+++ b/templates/compose/forgejo-with-runner.yaml
@@ -41,7 +41,6 @@ services:
     image: docker:dind
     hostname: docker
     privileged: true
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "dockerd"]
       interval: 10s