jellyfin/jellyfin-vue
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-vue.git synced 2024-11-23 22:19:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor(docker): lint Dockerfile

Browse Source
This commit is contained in:
Fernando Fernández 2022-01-13 14:11:47 +01:00 committed by Thibault
parent a202b4a384
commit 4587d15e52
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.docker/nginx.conf
View File

@ -1,14 +1,11 @@
server { server {
# You would want to make a separate file with its own server block for each virtual domain listen 80;
# on your server and then include them.
listen 80;
root /usr/share/nginx/html; root /usr/share/nginx/html;
location / { location / {
# First attempt to serve request as file, then # First attempt to serve request as file, then as directory, then fall back to redirecting to index.html
# as directory, then fall back to redirecting to index.html # This is needed for history mode in Vue router
# This is needed for history mode in Vue router try_files $uri $uri/ /index.html;
try_files $uri $uri/ /index.html; }
} }
}

4
Dockerfile
View File

@ -1,6 +1,5 @@
## This dockerfile builds the client entirely in a Docker context ## This dockerfile builds the client entirely in a Docker context
FROM node:16-alpine AS build FROM node:16-alpine AS build
# Set build arguments # Set build arguments
@ -33,7 +32,6 @@ RUN npm run build
FROM nginx:alpine FROM nginx:alpine
COPY --from=build /app/src/dist/ /usr/share/nginx/html/ COPY --from=build /app/src/dist/ /usr/share/nginx/html/
COPY --from=build /app/.docker/nginx.conf /etc/nginx/conf.d/default.conf COPY --from=build /app/.docker/nginx.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 EXPOSE 80
@ -41,4 +39,4 @@ EXPOSE 80
# Set labels # Set labels
LABEL maintainer="Jellyfin Packaging Team - packaging@jellyfin.org" LABEL maintainer="Jellyfin Packaging Team - packaging@jellyfin.org"
LABEL org.opencontainers.image.source="https://github.com/jellyfin/jellyfin-vue" LABEL org.opencontainers.image.source="https://github.com/jellyfin/jellyfin-vue"
LABEL org.opencontainers.image.description "Commit: ${NUXT_ENV_COMMIT} History router rode: ${HISTORY_ROUTER_MODE}" LABEL org.opencontainers.image.description="Commit: ${NUXT_ENV_COMMIT} History router rode: ${HISTORY_ROUTER_MODE}"

1
src/nuxt.config.ts
View File

@ -135,7 +135,6 @@ const config: NuxtConfig = {
} }
} }
}, },
// mode: process.env.HISTORY_ROUTER_MODE == '1' ? 'history' : 'hash'
mode: process.env.HISTORY_ROUTER_MODE === '1' ? 'history' : 'hash' mode: process.env.HISTORY_ROUTER_MODE === '1' ? 'history' : 'hash'
}, },
/* /*