From e6e1e24cb6dfbea7a628cb90c33fe911d7f2d026 Mon Sep 17 00:00:00 2001
From: Michele Cereda <cereda.michele@gmail.com>
Date: Sat, 18 May 2024 22:40:00 +0200
Subject: [PATCH] fix(containers): use volumes where possible

---
 containers/gitea/.gitignore                               | 6 ------
 containers/gitea/Makefile                                 | 5 +----
 containers/gitea/data/.gitkeep                            | 0
 containers/gitea/docker-compose.yml                       | 8 ++++++--
 containers/paperless-ngx/Makefile                         | 5 +++--
 containers/syncthing/config/.gitkeep                      | 0
 containers/syncthing/docker-compose.yml                   | 5 ++++-
 .../app.defaults.ini => examples/gitea.defaults.ini       | 3 +++
 8 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 containers/gitea/.gitignore
 delete mode 100644 containers/gitea/data/.gitkeep
 delete mode 100644 containers/syncthing/config/.gitkeep
 rename containers/gitea/config/app.defaults.ini => examples/gitea.defaults.ini (96%)

diff --git a/containers/gitea/.gitignore b/containers/gitea/.gitignore
deleted file mode 100644
index 4b428f9..0000000
--- a/containers/gitea/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/config/*
-!/config/*.defaults.ini
-!/config/*.example.ini
-
-/data/*
-!/data/.gitkeep
diff --git a/containers/gitea/Makefile b/containers/gitea/Makefile
index 69b3886..0f446af 100644
--- a/containers/gitea/Makefile
+++ b/containers/gitea/Makefile
@@ -1,8 +1,5 @@
 #!/usr/bin/env make
 
-pre-flight:
-	@mkdir -pv 'config' 'data'
-
 firewalld-open: override service_name ?= gitea
 firewalld-open: override webui_port ?= 3000
 firewalld-open: override ssh_port ?= 2222
@@ -16,5 +13,5 @@ firewalld-open: ${shell which 'firewall-cmd'}
 	@sudo firewall-cmd --permanent --add-service '${service_name}'
 	@sudo firewall-cmd --reload
 
-composition-go-brrr: ${shell which 'docker-compose'} pre-flight
+composition-go-brrr: ${shell which 'docker-compose'}
 	@docker-compose up -d
diff --git a/containers/gitea/data/.gitkeep b/containers/gitea/data/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/containers/gitea/docker-compose.yml b/containers/gitea/docker-compose.yml
index 1454374..4bdd21a 100644
--- a/containers/gitea/docker-compose.yml
+++ b/containers/gitea/docker-compose.yml
@@ -10,10 +10,14 @@ services:
     image: gitea/gitea:1.21.11-rootless
     restart: unless-stopped
     volumes:
-      - ${PWD}/data:/var/lib/gitea
-      - ${PWD}/config:/etc/gitea
+      - data:/var/lib/gitea
+      - config:/etc/gitea
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
       - 3000:3000
       - 2222:2222
+
+volumes:
+  config:
+  data:
diff --git a/containers/paperless-ngx/Makefile b/containers/paperless-ngx/Makefile
index 831f26c..6443961 100644
--- a/containers/paperless-ngx/Makefile
+++ b/containers/paperless-ngx/Makefile
@@ -1,14 +1,15 @@
 #!/usr/bin/env make
 
 pre-flight:
-	@mkdir -pv 'config' 'data'
+	@mkdir -pv 'consume' 'export'
 
 firewalld-open: override service_name ?= paperless-ngx
+firewalld-open: override service_port ?= 8000
 firewalld-open: ${shell which 'firewall-cmd'}
 	@sudo firewall-cmd --permanent --new-service '${service_name}'
 	@sudo firewall-cmd --permanent --service '${service_name}' --set-description 'FIXME'
 	@sudo firewall-cmd --permanent --service '${service_name}' --set-short 'FIXME'
-	@sudo firewall-cmd --permanent --service '${service_name}' --add-port '8000/tcp'
+	@sudo firewall-cmd --permanent --service '${service_name}' --add-port '${service_port}/tcp'
 	@sudo firewall-cmd --permanent --add-service '${service_name}'
 	@sudo firewall-cmd --reload
 
diff --git a/containers/syncthing/config/.gitkeep b/containers/syncthing/config/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/containers/syncthing/docker-compose.yml b/containers/syncthing/docker-compose.yml
index 9c284f8..62eed1f 100644
--- a/containers/syncthing/docker-compose.yml
+++ b/containers/syncthing/docker-compose.yml
@@ -10,7 +10,10 @@ services:
       - PUID=1000
       - PGID=100
     volumes:
-      - ${PWD}/config:/var/syncthing/config
+      - config:/var/syncthing/config
       - ${PWD}/data:/var/syncthing/data
     network_mode: host
     restart: unless-stopped
+
+volumes:
+  config:
diff --git a/containers/gitea/config/app.defaults.ini b/examples/gitea.defaults.ini
similarity index 96%
rename from containers/gitea/config/app.defaults.ini
rename to examples/gitea.defaults.ini
index 4a840ab..8433209 100644
--- a/containers/gitea/config/app.defaults.ini
+++ b/examples/gitea.defaults.ini
@@ -1,3 +1,6 @@
+; Gitea default configuration values
+; filename: /etc/gitea/app.ini
+
 APP_NAME = Gitea: Git with a cup of tea
 RUN_USER = git
 RUN_MODE = prod