chore: dockerfile layout changes (#19673)
Dockerfile layout changes Fix up web path feat: update server env vars for layout
This commit is contained in:
+9
-4
@@ -1,12 +1,17 @@
|
||||
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e
|
||||
|
||||
RUN apk add --no-cache tini
|
||||
RUN apk add --no-cache tini bash
|
||||
|
||||
USER node
|
||||
WORKDIR /usr/src/app
|
||||
COPY --chown=node:node package*.json ./
|
||||
|
||||
COPY --chown=node:node ./web/package* ./web/
|
||||
|
||||
WORKDIR /usr/src/app/web
|
||||
RUN npm ci
|
||||
|
||||
ENV CHOKIDAR_USEPOLLING=true \
|
||||
PATH="${PATH}:/usr/src/app/bin"
|
||||
PATH="${PATH}:/usr/src/app/web/bin"
|
||||
EXPOSE 24678
|
||||
EXPOSE 3000
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/bin/sh", "-c"]
|
||||
ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
TYPESCRIPT_SDK=/usr/src/open-api/typescript-sdk
|
||||
TYPESCRIPT_SDK=/usr/src/app/open-api/typescript-sdk
|
||||
|
||||
npm --prefix "$TYPESCRIPT_SDK" install
|
||||
npm --prefix "$TYPESCRIPT_SDK" run build
|
||||
|
||||
cd /usr/src/app || exit 1
|
||||
cd /usr/src/app/web || exit 1
|
||||
|
||||
COUNT=0
|
||||
UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"
|
||||
@@ -19,4 +19,4 @@ done
|
||||
|
||||
echo "Connected to $UPSTREAM"
|
||||
|
||||
node ./node_modules/.bin/vite dev --host 0.0.0.0 --port 3000
|
||||
npx vite dev --host 0.0.0.0 --port 3000
|
||||
|
||||
Reference in New Issue
Block a user