From dfe6ad409e56ac840dcf1c41ce13b4d42e270562 Mon Sep 17 00:00:00 2001
From: Christian Steinle <christiansteinle@arcor.de>
Date: Mon, 3 Mar 2025 14:37:24 +0100
Subject: [PATCH] Consistent formatting.

---
 automation/docker-compose.yaml        |  4 +-
 backup/docker-compose.yaml            |  2 -
 browser/docker-compose.yaml           |  2 -
 common/docker-compose.yaml            |  2 -
 dvb/docker-compose.yaml               |  2 -
 gitea/docker-compose.yaml             | 16 +++----
 kimai/docker-compose.yaml             | 16 +++----
 mattermost/docker-compose.yaml        |  4 +-
 monitoring/docker-compose.yaml        |  2 -
 networking/docker-compose.yaml        | 22 +++------
 nextcloud/docker-compose.yaml         | 18 ++++----
 paperless/docker-compose.yml          | 66 +++++++--------------------
 power-consumption/docker-compose.yaml |  4 +-
 vault/docker-compose.yaml             |  2 -
 wiki/docker-compose.yaml              |  4 +-
 15 files changed, 49 insertions(+), 117 deletions(-)

diff --git a/automation/docker-compose.yaml b/automation/docker-compose.yaml
index c4792d6..7f1ad68 100644
--- a/automation/docker-compose.yaml
+++ b/automation/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
@@ -59,5 +57,5 @@ services:
     networks:
       - semaphore
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)"]
+      test: [ "CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)" ]
 
diff --git a/backup/docker-compose.yaml b/backup/docker-compose.yaml
index 3c2dd1f..6b96930 100644
--- a/backup/docker-compose.yaml
+++ b/backup/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
diff --git a/browser/docker-compose.yaml b/browser/docker-compose.yaml
index 27f2ea4..c0d1945 100644
--- a/browser/docker-compose.yaml
+++ b/browser/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
diff --git a/common/docker-compose.yaml b/common/docker-compose.yaml
index d4bb106..ef59081 100644
--- a/common/docker-compose.yaml
+++ b/common/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: false
diff --git a/dvb/docker-compose.yaml b/dvb/docker-compose.yaml
index 88950b5..ea5a772 100644
--- a/dvb/docker-compose.yaml
+++ b/dvb/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 volumes:
   tv-data:
     name: tv-data
diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml
index 64d7bab..341a956 100644
--- a/gitea/docker-compose.yaml
+++ b/gitea/docker-compose.yaml
@@ -1,4 +1,9 @@
-version: "3.9"
+networks:
+  proxy:
+    external: true
+  gitea:
+    name: gitea
+    external: false
 
 volumes:
   gitea:
@@ -8,13 +13,6 @@ volumes:
   gitea-runner:
     name: gitea-runner
 
-networks:
-  proxy:
-    external: true
-  gitea:
-    name: gitea
-    external: false
-
 services:
   gitea:
     image: gitea/gitea
@@ -73,7 +71,7 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_DB: ${DB_NAME}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $DB_USER"]
+      test: [ "CMD-SHELL", "pg_isready -U $DB_USER" ]
 
   runner:
     image: gitea/act_runner
diff --git a/kimai/docker-compose.yaml b/kimai/docker-compose.yaml
index c5e77af..ed0e276 100644
--- a/kimai/docker-compose.yaml
+++ b/kimai/docker-compose.yaml
@@ -1,11 +1,3 @@
-version: "3.9"
-
-volumes:
-  kimai:
-    name: kimai
-  kimai-db:
-    name: kimai-db
-
 networks:
   proxy:
     external: true
@@ -13,6 +5,12 @@ networks:
     name: kimai
     external: false
 
+volumes:
+  kimai:
+    name: kimai
+  kimai-db:
+    name: kimai-db
+
 services:
   kimai:
     image: kimai/kimai2:fpm
@@ -66,5 +64,5 @@ services:
     networks:
       - kimai
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)"]
+      test: [ "CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)" ]
 
diff --git a/mattermost/docker-compose.yaml b/mattermost/docker-compose.yaml
index bb2aad2..add0b9a 100644
--- a/mattermost/docker-compose.yaml
+++ b/mattermost/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
@@ -71,5 +69,5 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_DB: ${DB_NAME}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $DB_USER"]
+      test: [ "CMD-SHELL", "pg_isready -U $DB_USER" ]
 
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index d1a079b..6743351 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
diff --git a/networking/docker-compose.yaml b/networking/docker-compose.yaml
index 018aace..2098038 100644
--- a/networking/docker-compose.yaml
+++ b/networking/docker-compose.yaml
@@ -1,14 +1,3 @@
-version: "3.9"
-
-volumes:
-  pihole:
-    name: pihole
-  dnsmasq:
-    name: dnsmasq
-  samba-config:
-    name: samba-config
-
-
 networks:
   networking:
     name: networking
@@ -31,6 +20,13 @@ networks:
   proxy:
     external: true
 
+volumes:
+  pihole:
+    name: pihole
+  dnsmasq:
+    name: dnsmasq
+  samba-config:
+    name: samba-config
 
 services:
   pihole:
@@ -90,10 +86,6 @@ services:
       - "53:53/udp"
     restart: unless-stopped
 
-  # Must add "ntlm auth = yes" to global section in smb.conf
-  # adduser and smbpasswd have to be run
-  # Sample smb.conf is copied to repo.
-
   nfs:
     image: gists/nfs-server
     container_name: nfs
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index f7fc226..3eac594 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -1,4 +1,9 @@
-version: "3.9"
+networks:
+  proxy:
+    external: true
+  nextcloud:
+    name: nextcloud
+    external: false
 
 volumes:
   nextcloud:
@@ -12,13 +17,6 @@ volumes:
   nextcloud-redis:
     name: nextcloud-redis
 
-networks:
-  proxy:
-    external: true
-  nextcloud:
-    name: nextcloud
-    external: false
-
 services:
   nextcloud:
     image: nextcloud:stable-fpm-alpine
@@ -91,7 +89,7 @@ services:
       POSTGRES_USER: ${DB_USER}
       POSTGRES_DB: ${DB_NAME}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $DB_USER"]
+      test: [ "CMD-SHELL", "pg_isready -U $DB_USER" ]
 
   nextcloud-redis:
     image: redis:alpine
@@ -103,5 +101,5 @@ services:
     networks:
       - nextcloud
     healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping"]
+      test: [ "CMD-SHELL", "redis-cli ping" ]
 
diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml
index 53816c7..4a29085 100644
--- a/paperless/docker-compose.yml
+++ b/paperless/docker-compose.yml
@@ -1,36 +1,18 @@
-# docker-compose file for running paperless from the docker container registry.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Instead of SQLite (default), PostgreSQL is used as the database server.
-# - Apache Tika and Gotenberg servers are started with paperless and paperless
-#   is configured to use these services. These provide support for consuming
-#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
+networks:
+  proxy:
+    external: true
+  paperless:
+    external: false
+    name: paperless
+
+volumes:
+  paperless-redis:
+  paperless-db:
+  paperless-data:
+  paperless-media:
+  paperless-export:
+  paperless-consume:
 
-version: "3.4"
 services:
   broker:
     image: docker.io/library/redis:7
@@ -61,7 +43,7 @@ services:
       - gotenberg
       - tika
     healthcheck:
-      test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000"]
+      test: [ "CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000" ]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -96,7 +78,7 @@ services:
       - "traefik.http.routers.paperless-secure.tls=true"
       - "traefik.http.routers.paperless-secure.tls.certresolver=myresolver"
       - "traefik.http.services.paperless-secure.loadbalancer.server.port=8000"
- 
+
 
   gotenberg:
     image: docker.io/gotenberg/gotenberg:8.7
@@ -113,19 +95,3 @@ services:
     restart: unless-stopped
     networks:
       - paperless
-
-volumes:
-  paperless-redis:
-  paperless-db:
-  paperless-data:
-  paperless-media:
-  paperless-export:
-  paperless-consume:
-
-
-networks:
-  proxy:
-    external: true
-  paperless:
-    external: false
-    name: paperless
diff --git a/power-consumption/docker-compose.yaml b/power-consumption/docker-compose.yaml
index aae74bd..9461e4a 100644
--- a/power-consumption/docker-compose.yaml
+++ b/power-consumption/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
@@ -45,5 +43,5 @@ services:
     networks:
       - power-consumption
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)"]
+      test: [ "CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)" ]
 
diff --git a/vault/docker-compose.yaml b/vault/docker-compose.yaml
index 0a5f64c..268abd2 100644
--- a/vault/docker-compose.yaml
+++ b/vault/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
diff --git a/wiki/docker-compose.yaml b/wiki/docker-compose.yaml
index 89e392b..34db4cb 100644
--- a/wiki/docker-compose.yaml
+++ b/wiki/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
@@ -55,5 +53,5 @@ services:
     networks:
       - bookstack
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)"]
+      test: [ "CMD-SHELL", "mysqladmin ping -u$${DB_USER} -p$$(DB_PASS)" ]