c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

Use runtime env var for login page message to lower web container startup time (#577)

Browse source 
* Use runtime env var for loginPageMessage

* Rename VITE_LOGIN_PAGE_MESSAGE to PUBLIC_LOGIN_PAGE_MESSAGE in .env.example

* Move docker image `npm run build` step into Dockerfile

* Remove comment from web Dockerfile
This commit is contained in:
bo0tzz 2022-09-05 16:51:45 +02:00 committed by GitHub
parent a81ef7497c
commit 564ace3ddf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/.env.example
View file

@ -61,6 +61,6 @@ MAPBOX_KEY=
#################################################################################### ####################################################################################
# Custom message on the login page, should be written in HTML form. # Custom message on the login page, should be written in HTML form.
# For example VITE_LOGIN_PAGE_MESSAGE="This is a demo instance of Immich.<br><br>Email: <i>demo@demo.de</i><br>Password: <i>demo</i>" # For example PUBLIC_LOGIN_PAGE_MESSAGE="This is a demo instance of Immich.<br><br>Email: <i>demo@demo.de</i><br>Password: <i>demo</i>"
VITE_LOGIN_PAGE_MESSAGE= PUBLIC_LOGIN_PAGE_MESSAGE=

5
web/Dockerfile
View file

@ -13,6 +13,8 @@ RUN npm ci
COPY --chown=node:node . . COPY --chown=node:node . .
RUN npm run build
EXPOSE 3000 EXPOSE 3000
FROM base AS dev FROM base AS dev
@ -22,6 +24,3 @@ CMD ["npm", "run", "dev"]
FROM base as prod FROM base as prod
ENV NODE_ENV=production ENV NODE_ENV=production
# Issue build command in entrypoint.sh to capture user .env file instead of the builder .env file.

1
web/entrypoint.sh
View file

@ -1,4 +1,3 @@
npm run build
if [ `id -u` -eq 0 ] && [ -n "$PUID" ] && [ -n "$PGID" ]; then if [ `id -u` -eq 0 ] && [ -n "$PUID" ] && [ -n "$PGID" ]; then
exec setpriv --reuid $PUID --regid $PGID --clear-groups node /usr/src/app/build/index.js exec setpriv --reuid $PUID --regid $PGID --clear-groups node /usr/src/app/build/index.js
else else

3
web/src/lib/constants.ts
View file

@ -1 +1,2 @@
export const loginPageMessage: string = import.meta.env.VITE_LOGIN_PAGE_MESSAGE; import { env } from '$env/dynamic/public';
export const loginPageMessage: string = env.PUBLIC_LOGIN_PAGE_MESSAGE;