diff --git a/compose.yml b/compose.yml index 06f0a7a73..721a5655f 100644 --- a/compose.yml +++ b/compose.yml @@ -50,29 +50,29 @@ services: - web - internal labels: - - "traefik.enable=true" + - 'traefik.enable=true' - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.rule=Host(`${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}`)" - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.entrypoints=web" - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.middlewares=redirect-scheme@file" + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.rule=Host(`${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}`)' + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.entrypoints=web' + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-web.middlewares=redirect-scheme@file' - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.rule=Host(`${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}`)" - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.entrypoints=webs" + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.rule=Host(`${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}`)' + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.entrypoints=webs' - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.tls=true" - - "traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.tls.domains[0].main=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}" + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.tls=true' + - 'traefik.http.routers.test-funkwhale-${COMPOSE_PROJECT_NAME:-funkwhale}-webs.tls.domains[0].main=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}' postgres: - image: "postgres:${POSTGRES_VERSION:-15}-alpine" + image: 'postgres:${POSTGRES_VERSION:-15}-alpine' environment: - POSTGRES_HOST_AUTH_METHOD command: postgres ${POSTGRES_ARGS:-} volumes: - - "./.state/${COMPOSE_PROJECT_NAME:-funkwhale}/postgres:/var/lib/postgresql/data" + - './.state/${COMPOSE_PROJECT_NAME:-funkwhale}/postgres:/var/lib/postgresql/data' networks: - internal healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: ['CMD-SHELL', 'pg_isready -U postgres'] interval: 10s timeout: 5s retries: 5 @@ -80,11 +80,11 @@ services: redis: image: redis:7-alpine volumes: - - "./.state/${COMPOSE_PROJECT_NAME:-funkwhale}/redis:/data" + - './.state/${COMPOSE_PROJECT_NAME:-funkwhale}/redis:/data' networks: - internal healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: ['CMD', 'redis-cli', 'ping'] interval: 10s timeout: 5s retries: 3 diff --git a/compose/app.django.yml b/compose/app.django.yml index b609da6b0..4b5e39065 100644 --- a/compose/app.django.yml +++ b/compose/app.django.yml @@ -5,11 +5,11 @@ x-django: &django - internal volumes: - ../api:/app - - "${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro" - - "../.state/plugins:/srv/funkwhale/plugins" - - "../.state/staticfiles:/staticfiles" - - "../.state/media:/protected/media" - - "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media" + - '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro' + - '../.state/plugins:/srv/funkwhale/plugins' + - '../.state/staticfiles:/staticfiles' + - '../.state/media:/protected/media' + - '../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media' environment: - DEBUG - FORCE @@ -20,9 +20,9 @@ x-django: &django - EXTERNAL_REQUESTS_VERIFY_SSL - - "FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}" + - 'FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}' - FUNKWHALE_PROTOCOL - - "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}" + - 'FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}' - DATABASE_URL - CACHE_URL @@ -30,8 +30,8 @@ x-django: &django - EMAIL_CONFIG - TYPESENSE_API_KEY - - "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/" - - "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/" + - 'STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/' + - 'MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/' - STATIC_ROOT - MEDIA_ROOT @@ -39,7 +39,7 @@ x-django: &django - FUNKWHALE_SPA_HTML_ROOT - LDAP_ENABLED - BROWSABLE_API_ENABLED - - "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}" + - 'MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}' - C_FORCE_ROOT - PYTHONDONTWRITEBYTECODE @@ -53,11 +53,7 @@ services: dockerfile: Dockerfile.debian command: develop healthcheck: - test: - [ - "CMD-SHELL", - "curl -o /dev/null -s -w '%{http_code}' http://localhost:5000/api/v1 | grep '301' || exit 1", - ] + test: ['CMD-SHELL', "curl -o /dev/null -s -w '%{http_code}' http://localhost:5000/api/v1 | grep '301' || exit 1"] interval: 10s timeout: 5s retries: 3 @@ -67,11 +63,7 @@ services: <<: *django command: develop-worker healthcheck: - test: - [ - "CMD-SHELL", - "celery -A funkwhale_api.taskapp status | grep 'OK' || exit 1", - ] + test: ['CMD-SHELL', "celery -A funkwhale_api.taskapp status | grep 'OK' || exit 1"] interval: 10s timeout: 5s retries: 3 diff --git a/compose/app.nginx.yml b/compose/app.nginx.yml index c926793e9..018325b9d 100644 --- a/compose/app.nginx.yml +++ b/compose/app.nginx.yml @@ -4,8 +4,8 @@ services: networks: - internal environment: - - "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}" - - "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}" + - 'MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}' + - 'FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}' - FUNKWHALE_PROTOCOL @@ -18,7 +18,7 @@ services: - NGINX_MAX_BODY_SIZE - STATIC_ROOT - - "MEDIA_ROOT=${MEDIA_ROOT:-/data/media}" + - 'MEDIA_ROOT=${MEDIA_ROOT:-/data/media}' volumes: - '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:${MUSIC_DIRECTORY_PATH:-/music}:ro' diff --git a/compose/app.typesense.yml b/compose/app.typesense.yml index 35b3311a5..2ca475c52 100644 --- a/compose/app.typesense.yml +++ b/compose/app.typesense.yml @@ -9,10 +9,10 @@ services: healthcheck: test: [ - "CMD", - "bash", - "-c", - "exec 3<>/dev/tcp/localhost/8108 && printf 'GET /health HTTP/1.1\\r\\nConnection: close\\r\\n\\r\\n' >&3 && head -n1 <&3 | grep '200' && exec 3>&-", + 'CMD', + 'bash', + '-c', + "exec 3<>/dev/tcp/localhost/8108 && printf 'GET /health HTTP/1.1\\r\\nConnection: close\\r\\n\\r\\n' >&3 && head -n1 <&3 | grep '200' && exec 3>&-" ] interval: 10s timeout: 5s diff --git a/compose/app.vue.yml b/compose/app.vue.yml index 758a0cb0c..0a2597821 100644 --- a/compose/app.vue.yml +++ b/compose/app.vue.yml @@ -4,14 +4,14 @@ services: build: context: ../front dockerfile: Dockerfile.dev - command: "yarn dev --host" + command: 'yarn dev --host' ports: - - "${VUE_PORT:-8080}:${VUE_PORT:-8080}" + - '${VUE_PORT:-8080}:${VUE_PORT:-8080}' networks: - internal volumes: - - "../front:/app" - - "/app/node_modules" + - '../front:/app' + - '/app/node_modules' environment: - HOST - VUE_PORT diff --git a/compose/net.verify.yml b/compose/net.verify.yml index 8a6c8eb1a..250d5d4b8 100644 --- a/compose/net.verify.yml +++ b/compose/net.verify.yml @@ -1,6 +1,6 @@ x-verify: &verify init: true - image: "busybox" + image: 'busybox' dns: 172.17.0.1 dns_search: funkwhale.test @@ -11,4 +11,4 @@ services: verify-internal-connectivity: <<: *verify - command: "ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test" + command: 'ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test'