From fb2ec846fabf8b055df2a7d2bfdb1bced564350e Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Tue, 27 Aug 2024 11:36:14 +0200
Subject: [PATCH] chore(compose): prefer less ambiguous variable notation

---
 compose.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/compose.yml b/compose.yml
index 3b000186d..8ebc25d29 100644
--- a/compose.yml
+++ b/compose.yml
@@ -13,9 +13,9 @@ services:
       - .env
     environment:
       - "HOST=0.0.0.0"
-      - "VUE_PORT=${VUE_PORT-8080}"
+      - "VUE_PORT=${VUE_PORT:-8080}"
     ports:
-      - "${VUE_PORT-8080}"
+      - "${VUE_PORT:-8080}"
     volumes:
       - "./front:/app"
       - "/app/node_modules"
@@ -33,12 +33,12 @@ services:
     env_file:
       - .env.dev
       - .env
-    image: postgres:${POSTGRES_VERSION-15}-alpine
+    image: postgres:${POSTGRES_VERSION:-15}-alpine
     environment:
       - "POSTGRES_HOST_AUTH_METHOD=trust"
-    command: postgres ${POSTGRES_ARGS-}
+    command: postgres ${POSTGRES_ARGS:-}
     volumes:
-      - "./data/${COMPOSE_PROJECT_NAME-node1}/postgres:/var/lib/postgresql/data"
+      - "./data/${COMPOSE_PROJECT_NAME:-node1}/postgres:/var/lib/postgresql/data"
     networks:
       - internal
 
@@ -48,7 +48,7 @@ services:
       - .env
     image: redis:7-alpine
     volumes:
-      - "./data/${COMPOSE_PROJECT_NAME-node1}/redis:/data"
+      - "./data/${COMPOSE_PROJECT_NAME:-node1}/redis:/data"
     networks:
       - internal
 
@@ -72,10 +72,10 @@ services:
       - "./data/staticfiles:/staticfiles"
       - "./data/media:/data/media"
     environment:
-      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}"
+      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME:-localhost}"
       - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test"
       - "FUNKWHALE_HOSTNAME_PREFIX=${COMPOSE_PROJECT_NAME}"
-      - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}"
+      - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL:-http}"
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "CACHE_URL=redis://redis:6379/0"
       - "STATIC_ROOT=/staticfiles"
@@ -104,15 +104,15 @@ services:
       - redis
     command: celery -A funkwhale_api.taskapp worker -l debug -B --concurrency=${CELERYD_CONCURRENCY-0}
     environment:
-      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}"
+      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME:-localhost}"
       - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test"
       - "FUNKWHALE_HOSTNAME_PREFIX=${COMPOSE_PROJECT_NAME}"
-      - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}"
+      - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL:-http}"
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "CACHE_URL=redis://redis:6379/0"
     volumes:
       - ./api:/app
-      - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
+      - "${MUSIC_DIRECTORY_SERVE_PATH:-./data/music}:/music:ro"
       - "./data/plugins:/srv/funkwhale/plugins"
       - "./data/media:/data/media"
     networks:
@@ -130,19 +130,19 @@ services:
     ports:
       - "${NGINX_PORTS_MAPPING-8000:80}"
     environment:
-      - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
-      - "FUNKWHALE_API_HOST=${FUNKWHALE_API_HOST-api}"
-      - "FUNKWHALE_API_PORT=${FUNKWHALE_API_PORT-5000}"
-      - "FUNKWHALE_FRONT_IP=${FUNKWHALE_FRONT_IP-front}"
-      - "FUNKWHALE_FRONT_PORT=${VUE_PORT-8080}"
-      - "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME- }"
-      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}"
+      - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE:-100M}"
+      - "FUNKWHALE_API_HOST=${FUNKWHALE_API_HOST:-api}"
+      - "FUNKWHALE_API_PORT=${FUNKWHALE_API_PORT:-5000}"
+      - "FUNKWHALE_FRONT_IP=${FUNKWHALE_FRONT_IP:-front}"
+      - "FUNKWHALE_FRONT_PORT=${VUE_PORT:-8080}"
+      - "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}"
+      - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME:-localhost}"
     depends_on:
       - api
       - front
     volumes:
       - ./docker/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro
-      - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro"
+      - "${MUSIC_DIRECTORY_SERVE_PATH:-./data/music}:/music:ro"
       - ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
       - "./front:/frontend:ro"
       - "./data/staticfiles:/staticfiles:ro"
@@ -152,8 +152,8 @@ services:
       - internal
 
     labels:
-      traefik.backend: "${COMPOSE_PROJECT_NAME-node1}"
-      traefik.frontend.rule: "Host:${COMPOSE_PROJECT_NAME-node1}.funkwhale.test,${NODE_IP-127.0.0.1},${DJANGO_ALLOWED_HOSTS}"
+      traefik.backend: "${COMPOSE_PROJECT_NAME:-node1}"
+      traefik.frontend.rule: "Host:${COMPOSE_PROJECT_NAME:-node1}.funkwhale.test,${NODE_IP:-127.0.0.1},${DJANGO_ALLOWED_HOSTS}"
       traefik.enable: "true"
       traefik.federation.protocol: "http"
       traefik.federation.port: "80"