From b7a7d44a753cae02cc482c77b81839fb6b2dda31 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 23 Sep 2026 18:47:28 +0200
Subject: [PATCH 1/4] specify user:group in compose services

---
 .../playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2 b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
index cf43b54..d68fd01 100644
--- a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
+++ b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
@@ -8,6 +8,7 @@ networks:
 services:
   server:
     image: codeberg.org/forgejo/forgejo:16.0.1
+    user: "{{ ansible_user_uid }}:{{ ansible_group_uid }}"
     container_name: forgejo
     restart: always
     environment:
@@ -39,6 +40,7 @@ services:
   db:
     image: postgres:14
     restart: always
+    user: "{{ ansible_user_uid }}:{{ ansible_group_uid }}"
     environment:
       - POSTGRES_USER=forgejo
       - POSTGRES_PASSWORD={{ forgejo_db_password }}

From 1e200bcb2537b3e11b01ea7ca078483bb0b6e940 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 23 Sep 2026 18:47:45 +0200
Subject: [PATCH 2/4] Coherent Paths

---
 ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml b/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
index 40aad45..4839ba5 100644
--- a/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
+++ b/ansible/playbooks/roles/forgejo/tasks/forgejo_docker.yaml
@@ -8,7 +8,7 @@
 
 - name: Create data directory
   ansible.builtin.file:
-    path: "/home/{{ ansible_user }}/forgejo/data"
+    path: "{{ compose_dir.path }}/data"
     state: directory
     mode: '0755'
   register: forgejo_data_dir
@@ -16,7 +16,7 @@
 
 - name: Create DB data directory
   ansible.builtin.file:
-    path: "/home/{{ ansible_user }}/forgejo/db"
+    path: "{{ compose_dir.path }}/db"
     state: directory
     mode: '0755'
   register: forgejo_db_dir

From 8af5c6bd928d29bee04ff8b101fff68b3afd38bc Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 23 Sep 2026 19:12:17 +0200
Subject: [PATCH 3/4] Rootless image

---
 .../playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2 b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
index d68fd01..89e0df0 100644
--- a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
+++ b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
@@ -7,7 +7,7 @@ networks:
 
 services:
   server:
-    image: codeberg.org/forgejo/forgejo:16.0.1
+    image: codeberg.org/forgejo/forgejo:16.0.1-rootless
     user: "{{ ansible_user_uid }}:{{ ansible_group_uid }}"
     container_name: forgejo
     restart: always

From 7217433fa522fe3ec60512c1148cea7376e533bb Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Sat, 26 Sep 2026 20:09:14 +0200
Subject: [PATCH 4/4] Fix path and ports

---
 .../playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2 b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
index 89e0df0..051f674 100644
--- a/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
+++ b/ansible/playbooks/roles/forgejo/templates/forgejo_compose.yaml.j2
@@ -27,11 +27,11 @@ services:
       - newt
       
     volumes:
-      - {{ forgejo_data_dir.path }}:/data
       - /etc/localtime:/etc/localtime:ro
+      - {{ forgejo_data_dir.path }}/gitea:/var/lib/gitea
     ports:
       - '3000:3000'
-      - '222:22'
+      - "222:2222"
 
     depends_on:
       - db