MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(compose): prefer less ambiguous variable notation

This commit is contained in:
jon r 2024-08-27 11:36:14 +02:00
parent 8fc29a3183
commit fb2ec846fa
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compose.yml
View File

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