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

fix(pre-commit): make prettier configuration global and let it do its thing

This commit is contained in:
jon r 2025-02-24 21:25:32 +01:00
parent a1a96d9560
commit ff32ff7bac
17 changed files with 149 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@ -8,18 +8,18 @@ include:
file: /templates/ssh-agent.yml file: /templates/ssh-agent.yml
variables: variables:
PYTHONDONTWRITEBYTECODE: "true" PYTHONDONTWRITEBYTECODE: 'true'
PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip
YARN_CACHE_FOLDER: $CI_PROJECT_DIR/.cache/yarn YARN_CACHE_FOLDER: $CI_PROJECT_DIR/.cache/yarn
POETRY_VIRTUALENVS_IN_PROJECT: "true" POETRY_VIRTUALENVS_IN_PROJECT: 'true'
.shared_variables: .shared_variables:
# Keep the git files permissions during job setup # Keep the git files permissions during job setup
keep_git_files_permissions: &keep_git_files_permissions keep_git_files_permissions: &keep_git_files_permissions
GIT_STRATEGY: clone GIT_STRATEGY: clone
GIT_DEPTH: "5" GIT_DEPTH: '5'
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 'true'
.shared_caches: .shared_caches:
# Cache for front related jobs # Cache for front related jobs
@ -232,7 +232,7 @@ test_api:
image: $CI_REGISTRY/funkwhale/ci/python-funkwhale-api:$PYTHON_VERSION image: $CI_REGISTRY/funkwhale/ci/python-funkwhale-api:$PYTHON_VERSION
parallel: parallel:
matrix: matrix:
- PYTHON_VERSION: ["3.10", "3.11", "3.12", "3.13"] - PYTHON_VERSION: ['3.10', '3.11', '3.12', '3.13']
services: services:
- name: postgres:15-alpine - name: postgres:15-alpine
command: command:
@ -242,11 +242,11 @@ test_api:
- name: redis:7-alpine - name: redis:7-alpine
cache: *api_cache cache: *api_cache
variables: variables:
DATABASE_URL: "postgresql://postgres@postgres/postgres" DATABASE_URL: 'postgresql://postgres@postgres/postgres'
FUNKWHALE_URL: "https://funkwhale.ci" FUNKWHALE_URL: 'https://funkwhale.ci'
DJANGO_SETTINGS_MODULE: config.settings.local DJANGO_SETTINGS_MODULE: config.settings.local
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
CACHE_URL: "redis://redis:6379/0" CACHE_URL: 'redis://redis:6379/0'
before_script: before_script:
- cd api - cd api
- make install - make install
@ -316,7 +316,7 @@ test_integration:
image: image:
name: cypress/included:13.6.4 name: cypress/included:13.6.4
entrypoint: [""] entrypoint: ['']
cache: cache:
- *front_cache - *front_cache
- key: - key:
@ -345,12 +345,12 @@ build_api_schema:
- redis:7-alpine - redis:7-alpine
cache: *api_cache cache: *api_cache
variables: variables:
DATABASE_URL: "postgresql://postgres@postgres/postgres" DATABASE_URL: 'postgresql://postgres@postgres/postgres'
FUNKWHALE_URL: "https://funkwhale.ci" FUNKWHALE_URL: 'https://funkwhale.ci'
DJANGO_SETTINGS_MODULE: config.settings.local DJANGO_SETTINGS_MODULE: config.settings.local
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
CACHE_URL: "redis://redis:6379/0" CACHE_URL: 'redis://redis:6379/0'
API_TYPE: "v1" API_TYPE: 'v1'
before_script: before_script:
- cd api - cd api
- make install - make install
@ -508,7 +508,7 @@ docker:
<<: *keep_git_files_permissions <<: *keep_git_files_permissions
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ''
BUILDKIT_PROGRESS: plain BUILDKIT_PROGRESS: plain
DOCKER_CACHE_IMAGE: $CI_REGISTRY/funkwhale/funkwhale/cache DOCKER_CACHE_IMAGE: $CI_REGISTRY/funkwhale/funkwhale/cache

24
.gitpod/docker-compose.yml
View File

@ -1,19 +1,19 @@
version: "3" version: '3'
services: services:
postgres: postgres:
image: postgres:15-alpine image: postgres:15-alpine
environment: environment:
- "POSTGRES_HOST_AUTH_METHOD=trust" - 'POSTGRES_HOST_AUTH_METHOD=trust'
volumes: volumes:
- "../data/postgres:/var/lib/postgresql/data" - '../data/postgres:/var/lib/postgresql/data'
ports: ports:
- 5432:5432 - 5432:5432
redis: redis:
image: redis:7-alpine image: redis:7-alpine
volumes: volumes:
- "../data/redis:/data" - '../data/redis:/data'
ports: ports:
- 6379:6379 - 6379:6379
@ -26,14 +26,14 @@ services:
extra_hosts: extra_hosts:
- host.docker.internal:host-gateway - host.docker.internal:host-gateway
environment: environment:
- "NGINX_MAX_BODY_SIZE=100M" - 'NGINX_MAX_BODY_SIZE=100M'
- "FUNKWHALE_API_IP=host.docker.internal" - 'FUNKWHALE_API_IP=host.docker.internal'
- "FUNKWHALE_API_HOST=host.docker.internal" - 'FUNKWHALE_API_HOST=host.docker.internal'
- "FUNKWHALE_API_PORT=5000" - 'FUNKWHALE_API_PORT=5000'
- "FUNKWHALE_FRONT_IP=host.docker.internal" - 'FUNKWHALE_FRONT_IP=host.docker.internal'
- "FUNKWHALE_FRONT_PORT=8080" - 'FUNKWHALE_FRONT_PORT=8080'
- "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}" - 'FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}'
- "FUNKWHALE_PROTOCOL=https" - 'FUNKWHALE_PROTOCOL=https'
volumes: volumes:
- ../data/media:/workspace/funkwhale/data/media:ro - ../data/media:/workspace/funkwhale/data/media:ro
- ../data/music:/music:ro - ../data/music:/music:ro

28
.prettierrc Normal file
View File

@ -0,0 +1,28 @@
{
"bracketSameLine": false,
"bracketSpacing": true,
"embeddedLanguageFormatting": "off",
"htmlWhitespaceSensitivity": "strict",
"printWidth": 160,
"semi": false,
"singleAttributePerLine": true,
"singleQuote": true,
"trailingComma": "none",
"tabWidth": 2,
"useTabs": false,
"overrides": [
{
"files": "*.html",
"options": {
"singleAttributePerLine": false
}
},
{
"files": "*.json",
"options": {
"parser": "json",
"printWidth": 80
}
}
]
}

46
compose.yml
View File

@ -13,17 +13,17 @@ 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
- 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
@ -31,7 +31,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
@ -46,12 +46,12 @@ services:
context: ./front context: ./front
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
ports: ports:
- "${VUE_PORT:-8080}:${VUE_PORT:-8080}" - '${VUE_PORT:-8080}:${VUE_PORT:-8080}'
environment: environment:
- VUE_PORT - VUE_PORT
volumes: volumes:
- "./front:/app" - './front:/app'
- "/app/node_modules" - '/app/node_modules'
networks: networks:
- internal - internal
@ -72,8 +72,8 @@ services:
file: ./compose/app.nginx.yml file: ./compose/app.nginx.yml
service: nginx service: nginx
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
@ -86,34 +86,34 @@ 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}'
networks: networks:
- 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}-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
@ -121,11 +121,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

16
compose/app.django.yml
View File

@ -3,11 +3,11 @@ x-django: &django
volumes: volumes:
- ../api:/app - ../api:/app
- ../.env:/app/.env - ../.env:/app/.env
- "${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'
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
@ -23,11 +23,7 @@ services:
context: ../api context: ../api
dockerfile: Dockerfile.debian dockerfile: Dockerfile.debian
healthcheck: healthcheck:
test: test: ['CMD-SHELL', 'docker compose logs api | grep -q "Uvicorn running on" || exit 0']
[
"CMD-SHELL",
'docker compose logs api | grep -q "Uvicorn running on" || exit 0',
]
interval: 3s interval: 3s
timeout: 5s timeout: 5s
retries: 3 retries: 3

2
compose/app.nginx.yml
View File

@ -5,7 +5,7 @@ services:
- api - api
- front - front
volumes: volumes:
- "${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:${MUSIC_DIRECTORY_PATH:-/music}:ro" - '${MUSIC_DIRECTORY_SERVE_PATH:-../.state/music}:${MUSIC_DIRECTORY_PATH:-/music}:ro'
- ./etc/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro - ./etc/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro
- ../deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro - ../deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro

22
compose/docs.openapi.yml
View File

@ -2,18 +2,18 @@ services:
openapi: openapi:
image: swaggerapi/swagger-ui image: swaggerapi/swagger-ui
environment: environment:
- "URL=/openapi.yml" - 'URL=/openapi.yml'
ports: ports:
- "8002:8080" - '8002:8080'
volumes: volumes:
- "../docs/specs/nodeinfo21/schema.yml:/usr/share/nginx/html/openapi.yml" - '../docs/specs/nodeinfo21/schema.yml:/usr/share/nginx/html/openapi.yml'
# - "../docs/api:/usr/share/nginx/html/api" # - "../docs/api:/usr/share/nginx/html/api"
labels: labels:
- "traefik.enable=true" - 'traefik.enable=true'
- "traefik.http.routers.test-funkwhale-openapi-web.rule=Host(`openapi.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-openapi-web.rule=Host(`openapi.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-openapi-web.entrypoints=web" - 'traefik.http.routers.test-funkwhale-openapi-web.entrypoints=web'
- "traefik.http.services.test-funkwhale-openapi.loadbalancer.server.port=8080" - 'traefik.http.services.test-funkwhale-openapi.loadbalancer.server.port=8080'
- "traefik.http.routers.test-funkwhale-openapi-webs.rule=Host(`openapi.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-openapi-webs.rule=Host(`openapi.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-openapi-webs.entrypoints=webs" - 'traefik.http.routers.test-funkwhale-openapi-webs.entrypoints=webs'
- "traefik.http.routers.test-funkwhale-openapi-webs.tls=true" - 'traefik.http.routers.test-funkwhale-openapi-webs.tls=true'
networks: ["web"] networks: ['web']

16
compose/docs.sphinx.yml
View File

@ -4,16 +4,16 @@ services:
context: ../ context: ../
dockerfile: docs/Dockerfile dockerfile: docs/Dockerfile
init: true init: true
ports: ["8001:8001"] ports: ['8001:8001']
command: sh -c 'cd /src/docs && make dev' command: sh -c 'cd /src/docs && make dev'
volumes: volumes:
- ../docs:/src/docs - ../docs:/src/docs
labels: labels:
- "traefik.enable=true" - 'traefik.enable=true'
- "traefik.http.routers.test-funkwhale-docs-web.rule=Host(`docs.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-docs-web.rule=Host(`docs.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-docs-web.entrypoints=web" - 'traefik.http.routers.test-funkwhale-docs-web.entrypoints=web'
- "traefik.http.routers.test-funkwhale-docs-webs.rule=Host(`docs.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-docs-webs.rule=Host(`docs.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-docs-webs.entrypoints=webs" - 'traefik.http.routers.test-funkwhale-docs-webs.entrypoints=webs'
- "traefik.http.routers.test-funkwhale-docs-webs.tls=true" - 'traefik.http.routers.test-funkwhale-docs-webs.tls=true'
networks: ["web"] networks: ['web']

24
compose/docs.ui.yml
View File

@ -4,18 +4,18 @@ services:
context: ../front context: ../front
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
command: yarn dev:docs --host 0.0.0.0 command: yarn dev:docs --host 0.0.0.0
expose: ["5173"] expose: ['5173']
ports: ports:
- "8003:5173" - '8003:5173'
volumes: volumes:
- "../front:/app" - '../front:/app'
- "/app/node_modules" - '/app/node_modules'
networks: ["web"] networks: ['web']
labels: labels:
- "traefik.enable=true" - 'traefik.enable=true'
- "traefik.http.routers.test-funkwhale-ui-web.rule=Host(`ui.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-ui-web.rule=Host(`ui.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-ui-web.entrypoints=web" - 'traefik.http.routers.test-funkwhale-ui-web.entrypoints=web'
- "traefik.http.services.test-funkwhale-ui.loadbalancer.server.port=5173" - 'traefik.http.services.test-funkwhale-ui.loadbalancer.server.port=5173'
- "traefik.http.routers.test-funkwhale-ui-webs.rule=Host(`ui.funkwhale.test`)" - 'traefik.http.routers.test-funkwhale-ui-webs.rule=Host(`ui.funkwhale.test`)'
- "traefik.http.routers.test-funkwhale-ui-webs.entrypoints=webs" - 'traefik.http.routers.test-funkwhale-ui-webs.entrypoints=webs'
- "traefik.http.routers.test-funkwhale-ui-webs.tls=true" - 'traefik.http.routers.test-funkwhale-ui-webs.tls=true'

2
compose/etc/traefik/dynamic/mailpit.yml
View File

@ -3,7 +3,7 @@ http:
test-funkwhale-mailpit: test-funkwhale-mailpit:
loadbalancer: loadbalancer:
servers: servers:
- url: "http://172.17.0.1:8025" - url: 'http://172.17.0.1:8025'
passhostheader: true passhostheader: true
routers: routers:
test-funkwhale-mailpit-web: test-funkwhale-mailpit-web:

6
compose/etc/traefik/traefik.yml
View File

@ -13,8 +13,8 @@ api:
entryPoints: entryPoints:
traefik: traefik:
address: "172.17.0.1:8008" address: '172.17.0.1:8008'
web: web:
address: "172.17.0.1:80" address: '172.17.0.1:80'
webs: webs:
address: "172.17.0.1:443" address: '172.17.0.1:443'

18
compose/net.helpers.yml
View File

@ -1,6 +1,6 @@
x-busybox: &busybox x-busybox: &busybox
init: true init: true
image: "busybox" image: 'busybox'
network_mode: bridge network_mode: bridge
dns: 172.17.0.1 dns: 172.17.0.1
dns_search: funkwhale.test dns_search: funkwhale.test
@ -11,18 +11,18 @@ networks:
services: services:
whoami: whoami:
image: "traefik/whoami" image: 'traefik/whoami'
networks: networks:
- web - web
labels: labels:
- "traefik.enable=true" - 'traefik.enable=true'
- "traefik.http.routers.whoami-web.rule=Host(`whoami.funkwhale.test`)" - 'traefik.http.routers.whoami-web.rule=Host(`whoami.funkwhale.test`)'
- "traefik.http.routers.whoami-web.entrypoints=web" - 'traefik.http.routers.whoami-web.entrypoints=web'
- "traefik.http.routers.whoami-webs.rule=Host(`whoami.funkwhale.test`)" - 'traefik.http.routers.whoami-webs.rule=Host(`whoami.funkwhale.test`)'
- "traefik.http.routers.whoami-webs.entrypoints=webs" - 'traefik.http.routers.whoami-webs.entrypoints=webs'
- "traefik.http.routers.whoami-webs.tls=true" - 'traefik.http.routers.whoami-webs.tls=true'
- "traefik.http.routers.whoami.tls.domains[0].main=whoami.funkwhale.test" - 'traefik.http.routers.whoami.tls.domains[0].main=whoami.funkwhale.test'
shell: shell:
<<: *busybox <<: *busybox

4
compose/net.mailpit.yml
View File

@ -9,5 +9,5 @@ services:
MP_SMTP_BIND_ADDR: 172.17.0.1:1025 MP_SMTP_BIND_ADDR: 172.17.0.1:1025
MP_MAX_MESSAGES: 5000 MP_MAX_MESSAGES: 5000
MP_DATABASE: /data/mailpit.db MP_DATABASE: /data/mailpit.db
MP_SMTP_AUTH_ACCEPT_ANY: "true" MP_SMTP_AUTH_ACCEPT_ANY: 'true'
MP_SMTP_AUTH_ALLOW_INSECURE: "true" MP_SMTP_AUTH_ALLOW_INSECURE: 'true'

10
compose/net.minio.yml
View File

@ -3,13 +3,13 @@ services:
image: minio/minio image: minio/minio
command: server /data command: server /data
volumes: volumes:
- "../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/minio:/data" - '../.state/${COMPOSE_PROJECT_NAME:-funkwhale}/minio:/data'
environment: environment:
- "MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID:-access_key}" - 'MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID:-access_key}'
- "MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY:-secret_key}" - 'MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY:-secret_key}'
- "MINIO_HTTP_TRACE: /dev/stdout" - 'MINIO_HTTP_TRACE: /dev/stdout'
ports: ports:
- "9000:9000" - '9000:9000'
networks: networks:
- web - web
- internal - internal

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'
network_mode: bridge network_mode: bridge
dns: 172.17.0.1 dns: 172.17.0.1
dns_search: funkwhale.test dns_search: funkwhale.test
@ -12,4 +12,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'

24
deploy/docker-compose.yml
View File

@ -1,11 +1,11 @@
version: "3" version: '3'
services: services:
postgres: postgres:
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
environment: environment:
- "POSTGRES_HOST_AUTH_METHOD=trust" - 'POSTGRES_HOST_AUTH_METHOD=trust'
image: postgres:15-alpine image: postgres:15-alpine
volumes: volumes:
- ./data/postgres:/var/lib/postgresql/data - ./data/postgres:/var/lib/postgresql/data
@ -41,8 +41,8 @@ services:
environment: environment:
- C_FORCE_ROOT=true - C_FORCE_ROOT=true
volumes: volumes:
- "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro" - '${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro'
- "${MEDIA_ROOT}:${MEDIA_ROOT}" - '${MEDIA_ROOT}:${MEDIA_ROOT}'
celerybeat: celerybeat:
restart: unless-stopped restart: unless-stopped
@ -65,9 +65,9 @@ services:
- redis - redis
env_file: .env env_file: .env
volumes: volumes:
- "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro" - '${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro'
- "${MEDIA_ROOT}:${MEDIA_ROOT}" - '${MEDIA_ROOT}:${MEDIA_ROOT}'
- "${STATIC_ROOT}:${STATIC_ROOT}" - '${STATIC_ROOT}:${STATIC_ROOT}'
front: front:
restart: unless-stopped restart: unless-stopped
@ -78,7 +78,7 @@ services:
- .env - .env
environment: environment:
# Override those variables in your .env file if needed # Override those variables in your .env file if needed
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}" - 'NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}'
volumes: volumes:
# Uncomment if you want to use your previous nginx config, please let us # Uncomment if you want to use your previous nginx config, please let us
# know what special configuration you need, so we can support it with out # know what special configuration you need, so we can support it with out
@ -86,12 +86,12 @@ services:
#- "./nginx/funkwhale.template:/etc/nginx/templates/default.conf.template:ro" #- "./nginx/funkwhale.template:/etc/nginx/templates/default.conf.template:ro"
#- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro" #- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"
- "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro" - '${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro'
- "${MEDIA_ROOT}:${MEDIA_ROOT}:ro" - '${MEDIA_ROOT}:${MEDIA_ROOT}:ro'
- "${STATIC_ROOT}:/usr/share/nginx/html/staticfiles:ro" - '${STATIC_ROOT}:/usr/share/nginx/html/staticfiles:ro'
ports: ports:
# override those variables in your .env file if needed # override those variables in your .env file if needed
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80" - '${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80'
typesense: typesense:
restart: unless-stopped restart: unless-stopped

28
front/package.json
View File

@ -132,33 +132,5 @@
"workbox-precaching": "6.5.4", "workbox-precaching": "6.5.4",
"workbox-routing": "6.5.4", "workbox-routing": "6.5.4",
"workbox-strategies": "6.5.4" "workbox-strategies": "6.5.4"
},
"prettier": {
"bracketSameLine": false,
"bracketSpacing": true,
"embeddedLanguageFormatting": "off",
"htmlWhitespaceSensitivity": "strict",
"printWidth": 160,
"semi": false,
"singleAttributePerLine": true,
"singleQuote": true,
"trailingComma": "none",
"tabWidth": 2,
"useTabs": false,
"overrides": [
{
"files": "*.html",
"options": {
"singleAttributePerLine": false
}
},
{
"files": "*.json",
"options": {
"parser": "json",
"printWidth": 80
}
}
]
} }
} }