cleanup

padhi-homelab · Oct 1, 2024 · 488b7b3 · 488b7b3
1 parent 1597140
commit 488b7b3
Show file tree

Hide file tree

Showing 66 changed files with 3 additions and 133 deletions.
diff --git a/.archive/i2p/docker-compose.yml b/.archive/i2p/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   caddy:
     hostname: caddy

diff --git a/.archive/nocodb/docker-compose.labels.yml b/.archive/nocodb/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   nocodb:
     labels:

diff --git a/.archive/nocodb/docker-compose.logging.yml b/.archive/nocodb/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   redis:
     logging:

diff --git a/.archive/nocodb/docker-compose.yml b/.archive/nocodb/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/.archive/snowflake/docker-compose.yml b/.archive/snowflake/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   snowflake:
     hostname: snowflake

diff --git a/.archive/tor/docker-compose.yml b/.archive/tor/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   default:
 

diff --git a/_scripts/test_comp.sh b/_scripts/test_comp.sh
@@ -100,7 +100,7 @@ CHECK $'[ $COMP_EXIT_CODE -eq $EXIT_CODE_SIMPLE_VERB_FAILURE ]' \
       "Expected EXIT_CODE_SIMPLE_VERB_FAILURE"
 
 # Wait for tang to start and record health status
-sleep 15s
+sleep 30s
 
 SETUP "that 'tang' is still running" \
       "status -P tang" \

diff --git a/airdcpp/docker-compose.labels.yml b/airdcpp/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   airdcpp:
     labels:

diff --git a/airdcpp/docker-compose.logging.yml b/airdcpp/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:

diff --git a/airdcpp/docker-compose.ports.yml b/airdcpp/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:

diff --git a/airdcpp/docker-compose.yml b/airdcpp/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/certbot/docker-compose.logging.yml b/certbot/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     logging:

diff --git a/certbot/docker-compose.ports.yml b/certbot/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     ports:

diff --git a/certbot/docker-compose.yml b/certbot/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   certbot:
     hostname: certbot

diff --git a/comp b/comp
@@ -469,9 +469,8 @@ if ! $DOCKER_COMPOSE_CMD version &> /dev/null ; then
         __error 'Failed to locate: `'"$DOCKER_COMPOSE_CMD"'` or `'"$DOCKER_CMD"'-compose`!'
         exit $EXIT_CODE_DEP_INSTALL_FAILURE
       fi
-    else
-      DOCKER_COMPOSE_CMD="$LIB_DIR/compose"
     fi
+    DOCKER_COMPOSE_CMD="$LIB_DIR/compose"
   else
     DOCKER_COMPOSE_CMD="$DOCKER_CMD-compose"
   fi
@@ -483,9 +482,8 @@ if ! command -v $YQ_CMD &> /dev/null ; then
       __error 'Failed to locate: `yq`!'
       exit $EXIT_CODE_DEP_INSTALL_FAILURE
     fi
-  else
-    YQ_CMD="$LIB_DIR/yq"
   fi
+  YQ_CMD="$LIB_DIR/yq"
 fi
 
 # # # # # # # # # # # # # # # # # # #      MAIN FUNCTION      # # # # # # # # # # # # # # # # # # #

diff --git a/docker_sock/docker-compose.labels.yml b/docker_sock/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   docker.sock-proxy:
     labels:

diff --git a/docker_sock/docker-compose.logging.yml b/docker_sock/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   docker.sock-proxy:
     logging:

diff --git a/docker_sock/docker-compose.yml b/docker_sock/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true

diff --git a/gitea/docker-compose.labels.yml b/gitea/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   gitea:
     labels:

diff --git a/gitea/docker-compose.logging.yml b/gitea/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   gitea:
     logging:

diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/hass/docker-compose.devices.yml b/hass/docker-compose.devices.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     devices:

diff --git a/hass/docker-compose.labels.yml b/hass/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     labels:

diff --git a/hass/docker-compose.logging.yml b/hass/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   hass:
     logging:

diff --git a/hass/docker-compose.yml b/hass/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/indexarr/docker-compose.labels.yml b/indexarr/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   jackett:
     labels:

diff --git a/indexarr/docker-compose.logging.yml b/indexarr/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:

diff --git a/indexarr/docker-compose.ports.yml b/indexarr/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:

diff --git a/indexarr/docker-compose.yml b/indexarr/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/influxdb/docker-compose.logging.yml b/influxdb/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     logging:

diff --git a/influxdb/docker-compose.ports.yml b/influxdb/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     ports:

diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   influxdb:
     hostname: influxdb

diff --git a/kodi_db/docker-compose.logging.yml b/kodi_db/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     logging:

diff --git a/kodi_db/docker-compose.ports.yml b/kodi_db/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     ports:

diff --git a/kodi_db/docker-compose.yml b/kodi_db/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     hostname: mariadb

diff --git a/monitarr/docker-compose.labels.yml b/monitarr/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lidarr:
     labels:

diff --git a/monitarr/docker-compose.logging.yml b/monitarr/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lidarr:
     logging:

diff --git a/monitarr/docker-compose.yml b/monitarr/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/navidrome/docker-compose.labels.yml b/navidrome/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   navidrome:
     labels:

diff --git a/navidrome/docker-compose.logging.yml b/navidrome/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   navidrome:
     logging:

diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/nextcloud/docker-compose.labels.yml b/nextcloud/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   nextcloud:
     labels:

diff --git a/nextcloud/docker-compose.logging.yml b/nextcloud/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mariadb:
     logging:

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/pihole/docker-compose.labels.yml b/pihole/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   pihole:
     labels:

diff --git a/pihole/docker-compose.logging.yml b/pihole/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   dnscrypt-proxy:
     logging:

diff --git a/pihole/docker-compose.ports.yml b/pihole/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   pihole:
     ports:

diff --git a/qbittorrent/docker-compose.labels.yml b/qbittorrent/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   qbittorrent:
     labels:

diff --git a/qbittorrent/docker-compose.logging.yml b/qbittorrent/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     logging:

diff --git a/qbittorrent/docker-compose.ports.yml b/qbittorrent/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   openvpn:
     ports:

diff --git a/qbittorrent/docker-compose.yml b/qbittorrent/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/tang/docker-compose.labels.yml b/tang/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   tang:
     labels:

diff --git a/tang/docker-compose.logging.yml b/tang/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   tang:
     logging:

diff --git a/tang/docker-compose.yml b/tang/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/telegraf/docker-compose.logging.yml b/telegraf/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   telegraf:
     logging:

diff --git a/telegraf/docker-compose.yml b/telegraf/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true

diff --git a/teslamate/docker-compose.labels.yml b/teslamate/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   teslamate:
     labels:

diff --git a/teslamate/docker-compose.ports.yml b/teslamate/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mqtt:
     ports:

diff --git a/teslamate/docker-compose.yml b/teslamate/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   proxy:
     external: true

diff --git a/traefik/docker-compose.labels.yml b/traefik/docker-compose.labels.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     labels:

diff --git a/traefik/docker-compose.logging.yml b/traefik/docker-compose.logging.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     logging:

diff --git a/traefik/docker-compose.ports.yml b/traefik/docker-compose.ports.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   traefik:
     ports:

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   shared:
     external: true