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

---
 firefoxsync/docker-compose.yaml | 2 --
 gitea/docker-compose.yaml       | 2 --
 monitoring/docker-compose.yaml  | 1 -
 nextcloud/docker-compose.yaml   | 2 --
 proxy/docker-compose.yaml       | 2 --
 pull-all.sh                     | 4 ++--
 start-all.sh                    | 2 +-
 stop-all.sh                     | 2 +-
 wallabag/docker-compose.yaml    | 1 -
 www/docker-compose.yaml         | 3 +--
 10 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml
index 50344f2..dc5aba5 100644
--- a/firefoxsync/docker-compose.yaml
+++ b/firefoxsync/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   syncserver:
diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml
index e632a46..68b97d8 100644
--- a/gitea/docker-compose.yaml
+++ b/gitea/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   web:
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
index a3e2a22..8a25bd1 100644
--- a/monitoring/docker-compose.yaml
+++ b/monitoring/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
 
   grafana:
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 161c7bb..8b8b529 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   web:
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 2c586e2..c46978a 100755
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
 
   traefik:
diff --git a/pull-all.sh b/pull-all.sh
index e29394f..791be2e 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);
 done
 
 for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose pull);
+   (cd "$dir" && echo "[$dir]" && docker compose pull);
 done
diff --git a/start-all.sh b/start-all.sh
index 032def4..834eba9 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/stop-all.sh b/stop-all.sh
index 6511582..46b6645 100755
--- a/stop-all.sh
+++ b/stop-all.sh
@@ -1,6 +1,6 @@
 #/bin/bash/
 
 for dir in ./*/ ; do
-   (cd "$dir" && echo "[$dir]" && docker-compose down);
+   (cd "$dir" && echo "[$dir]" && docker compose down);
 done
 
diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml
index 4093979..fa68e6e 100644
--- a/wallabag/docker-compose.yaml
+++ b/wallabag/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   app:
     image: wallabag/wallabag
diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml
index bc2e015..8372974 100644
--- a/www/docker-compose.yaml
+++ b/www/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.3"
-
 services:
 
   app:
@@ -28,3 +26,4 @@ services:
 networks:
   web:
     external: true
+