diff --git a/.env.dev b/.env.dev index d5c1fa687..9ce8dede0 100644 --- a/.env.dev +++ b/.env.dev @@ -12,6 +12,7 @@ FORWARDED_PROTO=http LDAP_ENABLED=False FUNKWHALE_SPA_HTML_ROOT=http://nginx/front/ PYTHONTRACEMALLOC=0 +STATIC_URL=http://localhost:8000/staticfiles/ # Uncomment this if you're using traefik/https # FORCE_HTTPS_URLS=True diff --git a/changes/changelog.d/1726.bugfix b/changes/changelog.d/1726.bugfix new file mode 100644 index 000000000..21a96f7c5 --- /dev/null +++ b/changes/changelog.d/1726.bugfix @@ -0,0 +1 @@ +Fixes development environment set-up with docker (1726) diff --git a/dev.yml b/dev.yml index 92bbfa234..683d1a47f 100644 --- a/dev.yml +++ b/dev.yml @@ -17,6 +17,7 @@ services: - "./po:/po" networks: - internal + command: "yarn dev" postgres: env_file: diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index f3a7c8aec..11c0b1307 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -69,12 +69,12 @@ http { text/x-component text/x-cross-domain-policy; - add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; object-src 'none'; media-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self' 'unsafe-eval'; connect-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; object-src 'none'; media-src 'self' data:"; add_header Referrer-Policy "strict-origin-when-cross-origin"; add_header X-Frame-Options "SAMEORIGIN" always; location /front/ { - add_header Content-Security-Policy "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; object-src 'none'; media-src 'self' data:"; + add_header Content-Security-Policy "default-src 'self' 'unsafe-eval'; connect-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; object-src 'none'; media-src 'self' data:"; add_header Referrer-Policy "strict-origin-when-cross-origin"; add_header Service-Worker-Allowed "/"; # uncomment the following line and comment the proxy-pass one diff --git a/front/package.json b/front/package.json index 2a50aebd5..1f7f8708f 100644 --- a/front/package.json +++ b/front/package.json @@ -5,7 +5,7 @@ "description": "Funkwhale front-end", "author": "Funkwhale Collective ", "scripts": { - "dev": "vite", + "dev": "vite --host --base=front", "build": "vite build", "build:deployment": "vite build --base /front/", "serve": "vite preview", diff --git a/front/vite.config.js b/front/vite.config.js index ee3ded929..0e23f8ba4 100644 --- a/front/vite.config.js +++ b/front/vite.config.js @@ -26,9 +26,16 @@ export default defineConfig({ } } ], + server: { + port: process.env.VUE_PORT || '8080', + hmr: { + port: '8000', + protocol: 'ws', + } + }, resolve: { alias: { "@": path.resolve(__dirname, "./src"), }, - }, + }, })