From 0e1e41abfdbbbf0beae8fa77f12e48892b7d891a Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Thu, 12 Jan 2023 10:03:26 +0100
Subject: [PATCH] docker compose v2

---
 dashboard/docker-compose.yaml  | 4 +---
 download/docker-compose.yaml   | 2 --
 monitoring/docker-compose.yaml | 7 +++----
 portainer/docker-compose.yaml  | 2 --
 print/docker-compose.yaml      | 5 ++---
 proxy/docker-compose.yaml      | 4 +---
 pull-all.sh                    | 4 ++--
 pull-min.sh                    | 2 +-
 smartHome/docker-compose.yaml  | 3 +--
 start-all.sh                   | 2 +-
 start-min.sh                   | 2 +-
 stop-all.sh                    | 2 +-
 telegraf/docker-compose.yaml   | 1 -
 torrent/docker-compose.yaml    | 2 --
 14 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/dashboard/docker-compose.yaml b/dashboard/docker-compose.yaml
index 40abac3..58f202c 100644
--- a/dashboard/docker-compose.yaml
+++ b/dashboard/docker-compose.yaml
@@ -1,9 +1,7 @@
-version: "3.3"
-
 services:
 
   app:
-    image: linuxserver/heimdall:2.4.10
+    image: linuxserver/heimdall:${HEIMDALL_VERSION}
     environment:
       - PUID=1000
       - PGID=1000
diff --git a/download/docker-compose.yaml b/download/docker-compose.yaml
index f1c0acf..670a5e0 100644
--- a/download/docker-compose.yaml
+++ b/download/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
 
   app:
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index cc9ce50..e3052a8 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -1,8 +1,7 @@
-version: "3.3"
 services:
 
   grafana:
-    image: grafana/grafana:8.1.3
+    image: grafana/grafana:${GRAFANA_VERSION}
     restart: unless-stopped
     expose:
       - "3000"
@@ -37,7 +36,7 @@ services:
 
 
   grafanadb:
-    image: postgres:13
+    image: postgres:${POSTGRES_VERSION}
     volumes:
       - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data
     networks:
@@ -52,7 +51,7 @@ services:
 
 
   influxdb:
-    image: influxdb:1.8
+    image: influxdb:${INFLUXDB_VERSION}
     restart: unless-stopped
     networks:
       - web
diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index 32cc1f3..3a6ed3e 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
 
   app:
diff --git a/print/docker-compose.yaml b/print/docker-compose.yaml
index 7740629..6a3fae4 100644
--- a/print/docker-compose.yaml
+++ b/print/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
 
   cups:
@@ -9,7 +7,7 @@ services:
       - /var/run/dbus:/var/run/dbus
       - ${VOLUMES_PATH}/cups:/etc/cups
     devices:
-      - /dev/usblp0
+      - /dev/usb/lp0
     privileged: true
     network_mode: host
     labels:
@@ -19,4 +17,5 @@ services:
       - "traefik.http.services.cups.loadbalancer.server.port=631"
       - "docker.group=print"
     restart: unless-stopped
+    pull_policy: build
 
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 5ca4c28..37522cb 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -1,9 +1,7 @@
-version: "3.3"
-
 services:
 
   traefik:
-    image: traefik:v2.4
+    image: traefik:${TRAEFIK_VERSION}
     restart: always
     ports:
       - "80:80"
diff --git a/pull-all.sh b/pull-all.sh
index e29394f..d0cd635 100755
--- a/pull-all.sh
+++ b/pull-all.sh
@@ -1,9 +1,9 @@
 #/bin/bash/
 
 for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose build);
+   (cd "$dir" && echo "[$dir]" && docker compose build --pull);
 done
 
 for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose pull);
+   (cd "$dir" && echo "[$dir]" && docker compose pull);
 done
diff --git a/pull-min.sh b/pull-min.sh
index 26f6b61..c2d2df6 100755
--- a/pull-min.sh
+++ b/pull-min.sh
@@ -1,7 +1,7 @@
 #/bin/bash/
 
 function pull {
-   (cd "$1" && echo "[$1]" && docker-compose pull);
+   (cd "$1" && echo "[$1]" && docker compose pull);
 }
 
 pull proxy;
diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml
index b4a829d..1bcbdce 100644
--- a/smartHome/docker-compose.yaml
+++ b/smartHome/docker-compose.yaml
@@ -1,11 +1,10 @@
-version: "3.3"
-
 services:
 
   homeassistant:
     image: ghcr.io/home-assistant/home-assistant:stable
     volumes:
       - ${VOLUMES_PATH}/homeassistent:/config
+      - /run/dbus:/run/dbus:ro
     environment:
       - TZ=Europe/Berlin
     restart: unless-stopped
diff --git a/start-all.sh b/start-all.sh
index 9a8cd65..32659e9 100755
--- a/start-all.sh
+++ b/start-all.sh
@@ -2,7 +2,7 @@
 
 
 function up {
-   (cd "$1" && echo "[$1]" && docker-compose up -d "${@:2}");
+   (cd "$1" && echo "[$1]" && docker compose up -d "${@:2}");
 }
 
 up proxy;
diff --git a/start-min.sh b/start-min.sh
index d3c45e9..5eb72c9 100755
--- a/start-min.sh
+++ b/start-min.sh
@@ -2,7 +2,7 @@
 
 
 function up {
-   (cd "$1" && echo "[$1]" && docker-compose up -d "${@:2}");
+   (cd "$1" && echo "[$1]" && docker compose up -d "${@:2}");
 }
 
 up proxy;
diff --git a/stop-all.sh b/stop-all.sh
index 55db3d8..8282d52 100755
--- a/stop-all.sh
+++ b/stop-all.sh
@@ -1,5 +1,5 @@
 #/bin/bash/
 
 for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose down);
+   (cd "$dir" && echo "[$dir]" && docker compose down);
 done
diff --git a/telegraf/docker-compose.yaml b/telegraf/docker-compose.yaml
index 1d0ba59..d351c19 100644
--- a/telegraf/docker-compose.yaml
+++ b/telegraf/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
 
   host:
diff --git a/torrent/docker-compose.yaml b/torrent/docker-compose.yaml
index 1d118e2..5503068 100644
--- a/torrent/docker-compose.yaml
+++ b/torrent/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
  qbittorrent:
    image: linuxserver/qbittorrent