fix minor convention issues across 10 stacks

docmost_dev/compose.yaml

@@ -2,11 +2,6 @@ services:
   docmost:
     image: ${DOCMOST_IMAGE:-docmost/docmost:latest}
     restart: ${DOCMOST_RESTART:-unless-stopped}
-    depends_on:
-      db:
-        condition: service_started
-      redis:
-        condition: service_started
     environment:
       - APP_URL=${APP_URL:-http://localhost:8000}
       - APP_SECRET=${APP_SECRET}
@@ -19,6 +14,11 @@ services:
     networks:
       - proxy
       - docmost_internal
+    depends_on:
+      db:
+        condition: service_started
+      redis:
+        condition: service_started
 
   db:
     image: ${POSTGRES_IMAGE:-postgres:16-alpine}

etherpad_dev/compose.yaml

@@ -2,11 +2,9 @@ services:
   etherpad:
     image: ${ETHERPAD_IMAGE:-node:18-slim}
     restart: ${ETHERPAD_RESTART:-unless-stopped}
-    command:
+    volumes:
-      - docker-entrypoint.sh
+      - ${VOL_PATH:-/data}/etherpad:/home/etherpad
-      - /bin/bash
+      - /etc/localtime:/etc/localtime:ro
-      - -c
-      - "npm install -g git+https://github.com/etherpad/etherpad-lite.git && cp -r /usr/local/lib/node_modules/etherpad-lite/* /home/etherpad/ && chmod -R 775 /home/etherpad/ && ls -la /home/etherpad/"
     environment:
       - TZ=${TZ:-UTC}
       - ETHERPAD_DEFAULT_TITLE=${ETHERPAD_DEFAULT_TITLE:-Etherpad}
@@ -14,15 +12,17 @@ services:
       - ETHERPAD_ADMIN_PASSWORD=${ETHERPAD_ADMIN_PASSWORD:-admin}
     ports:
       - "${ETHERPAD_PORT:-9001}:9001"
-    volumes:
-      - ${VOL_PATH:-/data}/etherpad:/home/etherpad
-      - /etc/localtime:/etc/localtime:ro
     networks:
       - proxy
       - internal
+    command:
+      - docker-entrypoint.sh
+      - /bin/bash
+      - -c
+      - "npm install -g git+https://github.com/etherpad/etherpad-lite.git && cp -r /usr/local/lib/node_modules/etherpad-lite/* /home/etherpad/ && chmod -R 775 /home/etherpad/ && ls -la /home/etherpad/"
 
 networks:
   proxy:
     external: true
   internal:
-    internal: true
+    internal: true

gatus/compose.yaml

@@ -9,7 +9,7 @@ services:
     environment:
       - TZ=${TZ:-America/Vancouver}
     ports:
-      - ${GATUS_PORT:-8080}:8080
+      - "${GATUS_PORT:-8080}:8080"
 
 networks:
   proxy:

immich_dev/compose.yaml

@@ -23,9 +23,6 @@ services:
     depends_on:
       - immich-redis
       - immich-postgres
-    healthcheck:
-      disable: false
-
   immich-machine-learning:
     # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag.
     # Example tag: ghcr.io/immich-app/immich-machine-learning:release-cuda
@@ -38,16 +35,11 @@ services:
       - ${VOL_PATH:-/data}/immich/model-cache:/cache
     networks:
       - immich_internal
-    healthcheck:
-      disable: false
-
   immich-redis:
     image: ${REDIS_IMAGE:-redis:6.2.19-alpine}
     restart: ${IMMICH_RESTART:-unless-stopped}
     networks:
       - immich_internal
-    healthcheck:
-      test: redis-cli ping || exit 1
 
   immich-postgres:
     image: ${POSTGRES_IMAGE:-tensorchord/pgvecto-rs:pg14-v0.2.0}
@@ -61,15 +53,6 @@ services:
       - POSTGRES_INITDB_ARGS=--data-checksums
     networks:
       - immich_internal
-    healthcheck:
-      test: >-
-        pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1;
-        Chksum="$$(psql --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" --tuples-only --no-align
-        --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')";
-        echo "checksum failure count is $$Chksum";
-        [ "$$Chksum" = '0' ] || exit 1
-      interval: 5m
-      start_period: 5m
     command: >-
       postgres
       -c shared_preload_libraries=vectors.so

mailu_dev/compose.yaml

@@ -1,6 +1,6 @@
 services:
   redis:
-    image: redis:alpine
+    image: ${MAILU_REDIS_IMAGE:-redis:alpine}
     restart: ${MAILU_RESTART:-always}
     volumes:
       - ${VOL_PATH:-/data}/mailu/redis:/data

mailu_dev/sample.env

@@ -5,6 +5,7 @@ MAILU_VERSION=2024.06
 MAILU_RESTART=always
 MAILU_ORG=ghcr.io/mailu
 MAILU_WEBMAIL=roundcube
+MAILU_REDIS_IMAGE=redis:alpine
 
 # Domain
 DOMAIN=example.com

ntfy_dev/compose.yaml

@@ -1,9 +1,12 @@
 services:
   ntfy:
-    image: ${NTFY_IMAGE:-binwiederhier/ntfy}
+    image: ${NTFY_IMAGE:-binwiederhier/ntfy:latest}
     restart: ${NTFY_RESTART:-unless-stopped}
-    command:
+    volumes:
-      - serve
+      - ${VOL_PATH:-/data}/ntfy:/etc/ntfy
+      - ${VOL_PATH:-/data}/ntfy-var:/var/lib/ntfy
+      - ${VOL_PATH:-/data}/ntfy-cache:/var/cache/ntfy
+      - /etc/localtime:/etc/localtime:ro
     environment:
       - TZ=${TZ:-UTC}
       - NTFY_BASE_URL=${NTFY_BASE_URL:-http://localhost}
@@ -16,14 +19,11 @@ services:
     ports:
       - "${NTFY_PORT:-80}:80"
       - "${NTFY_HTTP_PORT:-8080}:8080"
-    volumes:
-      - ${VOL_PATH:-/data}/ntfy:/etc/ntfy
-      - ${VOL_PATH:-/data}/ntfy-var:/var/lib/ntfy
-      - ${VOL_PATH:-/data}/ntfy-cache:/var/cache/ntfy
-      - /etc/localtime:/etc/localtime:ro
     networks:
       - proxy
       - internal
+    command:
+      - serve
 
 networks:
   proxy:

ollama/compose.yaml

@@ -1,6 +1,6 @@
 services:
   ollama:
-    image: ${OLLAMA_IMAGE:-ollama/ollama}
+    image: ${OLLAMA_IMAGE:-ollama/ollama:latest}
     restart: ${OLLAMA_RESTART:-unless-stopped}
     volumes:
       - ${VOL_PATH:-/data}/ollama:/root/.ollama

redis_dev/compose.yaml

@@ -12,11 +12,6 @@ services:
     networks:
       - proxy
       - internal
-    depends_on:
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: ${REDIS_HEALTHCHECK_INTERVAL:-20s}
-      timeout: ${REDIS_HEALTHCHECK_TIMEOUT:-3s}
 
 networks:
   proxy:

spotdl_dev/compose.yaml

@@ -2,13 +2,14 @@ services:
   spotdl:
     image: ${SPOTDL_IMAGE:-spotdl/spotify-downloader:latest}
     restart: ${SPOTDL_RESTART:-unless-stopped}
-    command: web
-    ports:
-      - "${SPOTDL_PORT:-8800}:8800"
     volumes:
       - ${VOL_PATH:-/data}/spotdl/music:/music
+    ports:
+      - "${SPOTDL_PORT:-8800}:8800"
     networks:
       - proxy
+    command:
+      - web
 
 networks:
   proxy:

vscode/compose.yaml

@@ -7,7 +7,7 @@ services:
 
     volumes:
       - ${VOL_PROJECTS:-/data/projects}:/data
-      - ${VOL_PATH:-./data}/vscode/config:/config
+      - ${VOL_PATH:-/data}/vscode/config:/config
 
     environment:
       # App-specific