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

Chore(compose): apply pre-commit formatter

This commit is contained in:
jon r 2025-04-24 15:31:01 +02:00
parent 5dbd079315
commit d5740bc023
6 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
compose.yml
View File

@ -50,29 +50,29 @@ services:
- web - web
- internal - internal
labels: 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.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.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.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.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.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=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.domains[0].main=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}'
postgres: postgres:
image: "postgres:${POSTGRES_VERSION:-15}-alpine" image: 'postgres:${POSTGRES_VERSION:-15}-alpine'
environment: environment:
- POSTGRES_HOST_AUTH_METHOD - POSTGRES_HOST_AUTH_METHOD
command: postgres ${POSTGRES_ARGS:-} command: postgres ${POSTGRES_ARGS:-}
volumes: volumes:
- "./.state/${COMPOSE_PROJECT_NAME:-funkwhale}/postgres:/var/lib/postgresql/data" - './.state/${COMPOSE_PROJECT_NAME:-funkwhale}/postgres:/var/lib/postgresql/data'
networks: networks:
- internal - internal
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"] test: ['CMD-SHELL', 'pg_isready -U postgres']
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -80,11 +80,11 @@ services:
redis: redis:
image: redis:7-alpine image: redis:7-alpine
volumes: volumes:
- "./.state/${COMPOSE_PROJECT_NAME:-funkwhale}/redis:/data" - './.state/${COMPOSE_PROJECT_NAME:-funkwhale}/redis:/data'
networks: networks:
- internal - internal
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "ping"] test: ['CMD', 'redis-cli', 'ping']
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3

32
compose/app.django.yml
View File

@ -5,11 +5,11 @@ x-django: &django
- internal - internal
volumes: volumes:
- ../api:/app - ../api:/app
- "${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro" - '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:/music:ro'
- "../.state/plugins:/srv/funkwhale/plugins" - '../.state/plugins:/srv/funkwhale/plugins'
- "../.state/staticfiles:/staticfiles" - '../.state/staticfiles:/staticfiles'
- "../.state/media:/protected/media" - '../.state/media:/protected/media'
- "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media" - '../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/media:/data/media'
environment: environment:
- DEBUG - DEBUG
- FORCE - FORCE
@ -20,9 +20,9 @@ x-django: &django
- EXTERNAL_REQUESTS_VERIFY_SSL - EXTERNAL_REQUESTS_VERIFY_SSL
- "FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}" - 'FORCE_HTTPS_URLS=${FORCE_HTTPS_URLS:-False}'
- FUNKWHALE_PROTOCOL - FUNKWHALE_PROTOCOL
- "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}" - 'FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}'
- DATABASE_URL - DATABASE_URL
- CACHE_URL - CACHE_URL
@ -30,8 +30,8 @@ x-django: &django
- EMAIL_CONFIG - EMAIL_CONFIG
- TYPESENSE_API_KEY - TYPESENSE_API_KEY
- "STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/" - 'STATIC_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/static/'
- "MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/" - 'MEDIA_URL=${FUNKWHALE_PROTOCOL}://${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}/media/'
- STATIC_ROOT - STATIC_ROOT
- MEDIA_ROOT - MEDIA_ROOT
@ -39,7 +39,7 @@ x-django: &django
- FUNKWHALE_SPA_HTML_ROOT - FUNKWHALE_SPA_HTML_ROOT
- LDAP_ENABLED - LDAP_ENABLED
- BROWSABLE_API_ENABLED - BROWSABLE_API_ENABLED
- "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}" - 'MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}'
- C_FORCE_ROOT - C_FORCE_ROOT
- PYTHONDONTWRITEBYTECODE - PYTHONDONTWRITEBYTECODE
@ -53,11 +53,7 @@ services:
dockerfile: Dockerfile.debian dockerfile: Dockerfile.debian
command: develop command: develop
healthcheck: healthcheck:
test: test: ['CMD-SHELL', "curl -o /dev/null -s -w '%{http_code}' http://localhost:5000/api/v1 | grep '301' || exit 1"]
[
"CMD-SHELL",
"curl -o /dev/null -s -w '%{http_code}' http://localhost:5000/api/v1 | grep '301' || exit 1",
]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
@ -67,11 +63,7 @@ services:
<<: *django <<: *django
command: develop-worker command: develop-worker
healthcheck: healthcheck:
test: test: ['CMD-SHELL', "celery -A funkwhale_api.taskapp status | grep 'OK' || exit 1"]
[
"CMD-SHELL",
"celery -A funkwhale_api.taskapp status | grep 'OK' || exit 1",
]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3

6
compose/app.nginx.yml
View File

@ -4,8 +4,8 @@ services:
networks: networks:
- internal - internal
environment: environment:
- "MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}" - 'MUSIC_DIRECTORY_PATH=${MUSIC_DIRECTORY_PATH:-/music}'
- "FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}" - 'FUNKWHALE_HOSTNAME=${COMPOSE_PROJECT_NAME:-funkwhale}.${FUNKWHALE_DOMAIN}'
- FUNKWHALE_PROTOCOL - FUNKWHALE_PROTOCOL
@ -18,7 +18,7 @@ services:
- NGINX_MAX_BODY_SIZE - NGINX_MAX_BODY_SIZE
- STATIC_ROOT - STATIC_ROOT
- "MEDIA_ROOT=${MEDIA_ROOT:-/data/media}" - 'MEDIA_ROOT=${MEDIA_ROOT:-/data/media}'
volumes: volumes:
- '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:${MUSIC_DIRECTORY_PATH:-/music}:ro' - '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:${MUSIC_DIRECTORY_PATH:-/music}:ro'

8
compose/app.typesense.yml
View File

@ -9,10 +9,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"bash", 'bash',
"-c", '-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>&-", "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 interval: 10s
timeout: 5s timeout: 5s

8
compose/app.vue.yml
View File

@ -4,14 +4,14 @@ services:
build: build:
context: ../front context: ../front
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
command: "yarn dev --host" command: 'yarn dev --host'
ports: ports:
- "${VUE_PORT:-8080}:${VUE_PORT:-8080}" - '${VUE_PORT:-8080}:${VUE_PORT:-8080}'
networks: networks:
- internal - internal
volumes: volumes:
- "../front:/app" - '../front:/app'
- "/app/node_modules" - '/app/node_modules'
environment: environment:
- HOST - HOST
- VUE_PORT - VUE_PORT

4
compose/net.verify.yml
View File

@ -1,6 +1,6 @@
x-verify: &verify x-verify: &verify
init: true init: true
image: "busybox" image: 'busybox'
dns: 172.17.0.1 dns: 172.17.0.1
dns_search: funkwhale.test dns_search: funkwhale.test
@ -11,4 +11,4 @@ services:
verify-internal-connectivity: verify-internal-connectivity:
<<: *verify <<: *verify
command: "ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test" command: 'ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test'