mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-10 12:40:20 +02:00
fix vite web build to work with subpath
This commit is contained in:
+13
-2
@@ -2,6 +2,11 @@
|
|||||||
FROM node:23-alpine as builder
|
FROM node:23-alpine as builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# PUBLIC_PATH at build time: passed as VITE_BASE_PATH so assets are built for that subpath.
|
||||||
|
# Use "/" for root or "/feishin/" for a subpath (trailing slash required for subpaths).
|
||||||
|
ARG PUBLIC_PATH=/
|
||||||
|
ENV PUBLIC_PATH=${PUBLIC_PATH}
|
||||||
|
|
||||||
# Copy package.json first to cache node_modules
|
# Copy package.json first to cache node_modules
|
||||||
COPY package.json pnpm-lock.yaml .
|
COPY package.json pnpm-lock.yaml .
|
||||||
|
|
||||||
@@ -10,18 +15,24 @@ RUN npm install -g pnpm
|
|||||||
RUN pnpm install
|
RUN pnpm install
|
||||||
|
|
||||||
# Copy code and build with cached modules
|
# Copy code and build with cached modules
|
||||||
|
# Normalize PUBLIC_PATH to trailing slash for subpaths (Vite base expects "/" or "/foo/")
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN pnpm run build:web
|
RUN VITE_BASE_PATH=$(echo "$PUBLIC_PATH" | sed 's|/*$|/|') && \
|
||||||
|
export VITE_BASE_PATH && \
|
||||||
|
pnpm run build:web
|
||||||
|
|
||||||
# --- Production stage
|
# --- Production stage
|
||||||
FROM nginx:alpine-slim
|
FROM nginx:alpine-slim
|
||||||
|
|
||||||
|
ARG PUBLIC_PATH=/
|
||||||
|
ENV PUBLIC_PATH=${PUBLIC_PATH}
|
||||||
|
|
||||||
COPY --chown=nginx:nginx --from=builder /app/out/web /usr/share/nginx/html
|
COPY --chown=nginx:nginx --from=builder /app/out/web /usr/share/nginx/html
|
||||||
COPY ./settings.js.template /etc/nginx/templates/settings.js.template
|
COPY ./settings.js.template /etc/nginx/templates/settings.js.template
|
||||||
COPY ng.conf.template /etc/nginx/templates/default.conf.template
|
COPY ng.conf.template /etc/nginx/templates/default.conf.template
|
||||||
|
|
||||||
ENV SERVER_LOCK=false SERVER_NAME="" SERVER_TYPE="" SERVER_URL=""
|
ENV SERVER_LOCK=false SERVER_NAME="" SERVER_TYPE="" SERVER_URL=""
|
||||||
ENV LEGACY_AUTHENTICATION="" ANALYTICS_DISABLED="" PUBLIC_PATH="/"
|
ENV LEGACY_AUTHENTICATION="" ANALYTICS_DISABLED=""
|
||||||
|
|
||||||
EXPOSE 9180
|
EXPOSE 9180
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ services:
|
|||||||
- SERVER_URL= # http://address:port or https://address:port
|
- SERVER_URL= # http://address:port or https://address:port
|
||||||
- LEGACY_AUTHENTICATION=false # When SERVER_LOCK is true, sets the legacy (plaintext) authentication flag for Subsonic/OpenSubsonic servers
|
- LEGACY_AUTHENTICATION=false # When SERVER_LOCK is true, sets the legacy (plaintext) authentication flag for Subsonic/OpenSubsonic servers
|
||||||
- ANALYTICS_DISABLED=true # Set to true to disable Umami analytics tracking
|
- ANALYTICS_DISABLED=true # Set to true to disable Umami analytics tracking
|
||||||
|
- PUBLIC_PATH=/feishin/ # Optional: if you want to host Feishin on a subpath (not `/`)
|
||||||
ports:
|
ports:
|
||||||
- 9180:9180
|
- 9180:9180
|
||||||
# Alternatively, to restrict to only localhost, - 127.0.0.1:9180:8190
|
# Alternatively, to restrict to only localhost, - 127.0.0.1:9180:8190
|
||||||
@@ -130,7 +131,7 @@ services:
|
|||||||
- **Navidrome** - For the best experience, select "Save password" when creating the server and configure the `SessionTimeout` setting in your Navidrome config to a larger value (e.g. 72h).
|
- **Navidrome** - For the best experience, select "Save password" when creating the server and configure the `SessionTimeout` setting in your Navidrome config to a larger value (e.g. 72h).
|
||||||
- **Linux users** - The default password store uses `libsecret`. `kwallet4/5/6` are also supported, but must be explicitly set in Settings > Window > Passwords/secret store.
|
- **Linux users** - The default password store uses `libsecret`. `kwallet4/5/6` are also supported, but must be explicitly set in Settings > Window > Passwords/secret store.
|
||||||
|
|
||||||
3. _Optional_ - If you want to host Feishin on a subpath (not `/`), then pass in the following environment variable: `PUBLIC_PATH=PATH`. For example, to host on `/feishin`, pass in `PUBLIC_PATH=/feishin`.
|
3. _Optional_ - If you want to host Feishin on a subpath (not `/`), pass `PUBLIC_PATH` at **build time** (and the same value at run time for nginx). Use a trailing slash for subpaths, e.g. `PUBLIC_PATH=/feishin/`. Example: `docker build --build-arg PUBLIC_PATH=/feishin/ .` then run with `-e PUBLIC_PATH=/feishin/`.
|
||||||
|
|
||||||
4. _Optional_ - To hard code the server url, pass the following environment variables: `SERVER_NAME`, `SERVER_TYPE` (one of `jellyfin` or `navidrome` or `subsonic`), `SERVER_URL`. To prevent users from changing these settings, pass `SERVER_LOCK=true`. This can only be set if all three of the previous values are set. When `SERVER_LOCK=true`, you can also set `LEGACY_AUTHENTICATION=true` or `LEGACY_AUTHENTICATION=false` to configure the legacy authentication flag for the server (only applicable for Subsonic/OpenSubsonic servers).
|
4. _Optional_ - To hard code the server url, pass the following environment variables: `SERVER_NAME`, `SERVER_TYPE` (one of `jellyfin` or `navidrome` or `subsonic`), `SERVER_URL`. To prevent users from changing these settings, pass `SERVER_LOCK=true`. This can only be set if all three of the previous values are set. When `SERVER_LOCK=true`, you can also set `LEGACY_AUTHENTICATION=true` or `LEGACY_AUTHENTICATION=false` to configure the legacy authentication flag for the server (only applicable for Subsonic/OpenSubsonic servers).
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -12,9 +12,10 @@ server {
|
|||||||
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||||
gzip_comp_level 9;
|
gzip_comp_level 9;
|
||||||
|
|
||||||
|
# PUBLIC_PATH must be "/" or a subpath with trailing slash (e.g. "/feishin/")
|
||||||
location ${PUBLIC_PATH} {
|
location ${PUBLIC_PATH} {
|
||||||
alias /usr/share/nginx/html/;
|
alias /usr/share/nginx/html/;
|
||||||
try_files $uri $uri/ /index.html =404;
|
try_files $uri $uri/ /index.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ${PUBLIC_PATH}settings.js {
|
location ${PUBLIC_PATH}settings.js {
|
||||||
|
|||||||
+11
-5
@@ -4,8 +4,12 @@ import { defineConfig, normalizePath } from 'vite';
|
|||||||
import { ViteEjsPlugin } from 'vite-plugin-ejs';
|
import { ViteEjsPlugin } from 'vite-plugin-ejs';
|
||||||
import { VitePWA } from 'vite-plugin-pwa';
|
import { VitePWA } from 'vite-plugin-pwa';
|
||||||
|
|
||||||
export default defineConfig({
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
base: '/',
|
export default defineConfig(({ mode }) => {
|
||||||
|
const base = process.env.VITE_BASE_PATH || '/';
|
||||||
|
|
||||||
|
return {
|
||||||
|
base,
|
||||||
build: {
|
build: {
|
||||||
emptyOutDir: true,
|
emptyOutDir: true,
|
||||||
outDir: path.resolve(__dirname, './out/web'),
|
outDir: path.resolve(__dirname, './out/web'),
|
||||||
@@ -16,7 +20,9 @@ export default defineConfig({
|
|||||||
'128x128': normalizePath(path.resolve(__dirname, './assets/icons/128x128.png')),
|
'128x128': normalizePath(path.resolve(__dirname, './assets/icons/128x128.png')),
|
||||||
'256x256': normalizePath(path.resolve(__dirname, './assets/icons/256x256.png')),
|
'256x256': normalizePath(path.resolve(__dirname, './assets/icons/256x256.png')),
|
||||||
'512x512': normalizePath(path.resolve(__dirname, './assets/icons/512x512.png')),
|
'512x512': normalizePath(path.resolve(__dirname, './assets/icons/512x512.png')),
|
||||||
'1024x1024': normalizePath(path.resolve(__dirname, './assets/icons/1024x1024.png')),
|
'1024x1024': normalizePath(
|
||||||
|
path.resolve(__dirname, './assets/icons/1024x1024.png'),
|
||||||
|
),
|
||||||
favicon: normalizePath(path.resolve(__dirname, './assets/icons/favicon.ico')),
|
favicon: normalizePath(path.resolve(__dirname, './assets/icons/favicon.ico')),
|
||||||
index: normalizePath(path.resolve(__dirname, './src/renderer/index.html')),
|
index: normalizePath(path.resolve(__dirname, './src/renderer/index.html')),
|
||||||
preview_full_screen_player: normalizePath(
|
preview_full_screen_player: normalizePath(
|
||||||
@@ -102,13 +108,12 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
short_name: 'Feishin',
|
short_name: 'Feishin',
|
||||||
start_url: '/',
|
start_url: '.',
|
||||||
theme_color: '#1E003D',
|
theme_color: '#1E003D',
|
||||||
},
|
},
|
||||||
manifestFilename: 'assets/manifest.webmanifest',
|
manifestFilename: 'assets/manifest.webmanifest',
|
||||||
outDir: path.resolve(__dirname, './out/web/'),
|
outDir: path.resolve(__dirname, './out/web/'),
|
||||||
registerType: 'autoUpdate',
|
registerType: 'autoUpdate',
|
||||||
scope: '/',
|
|
||||||
workbox: {
|
workbox: {
|
||||||
cleanupOutdatedCaches: true,
|
cleanupOutdatedCaches: true,
|
||||||
clientsClaim: true,
|
clientsClaim: true,
|
||||||
@@ -126,4 +131,5 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
root: path.resolve(__dirname, './src/renderer'),
|
root: path.resolve(__dirname, './src/renderer'),
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user