mirror of
https://github.com/immich-app/immich.git
synced 2025-10-31 18:47:09 -04:00
Use explicit users and chown instad of umask 000
This commit is contained in:
parent
97c256e89b
commit
a8e20d7b49
@ -3,9 +3,6 @@
|
|||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
source /immich-devcontainer/container-common.sh
|
source /immich-devcontainer/container-common.sh
|
||||||
|
|
||||||
log "Setting up Immich dev container..."
|
|
||||||
fix_permissions
|
|
||||||
|
|
||||||
log "Installing npm dependencies (node_modules)..."
|
log "Installing npm dependencies (node_modules)..."
|
||||||
install_dependencies
|
install_dependencies
|
||||||
|
|
||||||
|
|||||||
@ -22,6 +22,9 @@ services:
|
|||||||
# file: hwaccel.transcoding.yml
|
# file: hwaccel.transcoding.yml
|
||||||
# service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
|
# service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
|
||||||
build:
|
build:
|
||||||
|
args:
|
||||||
|
- SERVER_USER=${SERVER_USER:-0}
|
||||||
|
- SERVER_GROUP=${SERVER_GROUP:-0}
|
||||||
context: ../
|
context: ../
|
||||||
dockerfile: server/Dockerfile
|
dockerfile: server/Dockerfile
|
||||||
target: dev
|
target: dev
|
||||||
@ -35,7 +38,6 @@ services:
|
|||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
user: ${SERVER_UID:-0}:${SERVER_GID:-0}
|
|
||||||
environment:
|
environment:
|
||||||
IMMICH_REPOSITORY: immich-app/immich
|
IMMICH_REPOSITORY: immich-app/immich
|
||||||
IMMICH_REPOSITORY_URL: https://github.com/immich-app/immich
|
IMMICH_REPOSITORY_URL: https://github.com/immich-app/immich
|
||||||
@ -67,9 +69,12 @@ services:
|
|||||||
immich-web:
|
immich-web:
|
||||||
container_name: immich_web
|
container_name: immich_web
|
||||||
image: immich-web-dev:latest
|
image: immich-web-dev:latest
|
||||||
# user: 0:0 needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
|
# Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
|
||||||
user: ${WEB_UID:-1000}:${WEB_GID:-1000}
|
# user: 0:0
|
||||||
build:
|
build:
|
||||||
|
args:
|
||||||
|
- WEB_USER=${WEB_USER:-1000}
|
||||||
|
- WEB_GROUP=${WEB_GROUP:-1000}
|
||||||
context: ../
|
context: ../
|
||||||
dockerfile: web/Dockerfile
|
dockerfile: web/Dockerfile
|
||||||
command: ['immich-web']
|
command: ['immich-web']
|
||||||
|
|||||||
@ -1,14 +1,17 @@
|
|||||||
# dev build
|
# dev build
|
||||||
FROM ghcr.io/immich-app/base-server-dev:202507162011@sha256:85d4230c2208646bd6c528db41b2213d780b11b7a311397ca6a2aaba7cf697c8 AS dev
|
FROM ghcr.io/immich-app/base-server-dev:202507162011@sha256:85d4230c2208646bd6c528db41b2213d780b11b7a311397ca6a2aaba7cf697c8 AS dev
|
||||||
|
|
||||||
|
ARG SERVER_USER=0
|
||||||
|
ARG SERVER_GROUP=${SERVER_USER}
|
||||||
|
|
||||||
|
RUN chown -R ${SERVER_USER}:${SERVER_GROUP} /usr/src/app
|
||||||
|
USER ${SERVER_USER}:${SERVER_GROUP}
|
||||||
|
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
COPY ./server/package* ./server/
|
COPY --chown=${SERVER_USER}:${SERVER_GROUP} ./server/package* ./server/
|
||||||
WORKDIR /usr/src/app/server
|
WORKDIR /usr/src/app/server
|
||||||
RUN echo "umask 000" | tee /etc/profile /etc/bash.bashrc >/dev/null && \
|
|
||||||
umask 000 && \
|
RUN mkdir -p /usr/src/app/upload && \
|
||||||
chmod o+wx /usr/src/app && \
|
|
||||||
chmod o+wx /usr/src/app/server && \
|
|
||||||
mkdir -p /usr/src/app/upload && \
|
|
||||||
npm ci && \
|
npm ci && \
|
||||||
# exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need
|
# exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need
|
||||||
# they're marked as optional dependencies, so we need to copy them manually after pruning
|
# they're marked as optional dependencies, so we need to copy them manually after pruning
|
||||||
@ -22,23 +25,27 @@ ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
|
|||||||
|
|
||||||
FROM dev AS dev-container-server
|
FROM dev AS dev-container-server
|
||||||
|
|
||||||
RUN rm -rf /usr/src/app
|
USER 0:0
|
||||||
RUN apt-get update && \
|
RUN rm -rf /usr/src/app && \
|
||||||
apt-get install sudo inetutils-ping openjdk-11-jre-headless \
|
apt-get update && \
|
||||||
|
apt-get install inetutils-ping openjdk-11-jre-headless \
|
||||||
vim nano \
|
vim nano \
|
||||||
-y --no-install-recommends --fix-missing
|
-y --no-install-recommends --fix-missing
|
||||||
|
|
||||||
RUN usermod -aG sudo node
|
RUN mkdir -p /workspaces/immich/server/node_modules && \
|
||||||
RUN echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
mkdir -p /workspaces/immich/web/node_modules && \
|
||||||
RUN mkdir -p /workspaces/immich
|
mkdir -p /workspaces/immich/open-api/typescript-sdk/node_modules && \
|
||||||
COPY --chmod=777 ../.devcontainer/server/*.sh /immich-devcontainer/
|
chown -R ${SERVER_USER}:${SERVER_GROUP} /workspaces/immich
|
||||||
|
|
||||||
COPY .. /tmp/create-dep-cache/
|
USER $SERVER_USER:$SERVER_GROUP
|
||||||
|
COPY --chmod=555 --chown=${SERVER_USER}:${SERVER_GROUP} ../.devcontainer/server/*.sh /immich-devcontainer/
|
||||||
|
|
||||||
|
COPY --chown=${SERVER_USER}:${SERVER_GROUP} .. /tmp/create-dep-cache/
|
||||||
WORKDIR /tmp/create-dep-cache
|
WORKDIR /tmp/create-dep-cache
|
||||||
RUN make ci-all && rm -rf /tmp/create-dep-cache
|
RUN make ci-all && rm -rf /tmp/create-dep-cache
|
||||||
|
|
||||||
FROM dev-container-server AS dev-container-mobile
|
FROM dev-container-server AS dev-container-mobile
|
||||||
|
USER 0:0
|
||||||
# Enable multiarch for arm64 if necessary
|
# Enable multiarch for arm64 if necessary
|
||||||
RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
|
RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
|
||||||
dpkg --add-architecture amd64 && \
|
dpkg --add-architecture amd64 && \
|
||||||
@ -62,20 +69,20 @@ RUN mkdir -p ${FLUTTER_HOME} \
|
|||||||
&& curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
|
&& curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
|
||||||
&& tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
|
&& tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
|
||||||
&& rm flutter.tar.xz \
|
&& rm flutter.tar.xz \
|
||||||
&& chown -R node ${FLUTTER_HOME}
|
&& chown -R ${SERVER_USER}:${SERVER_GROUP} ${FLUTTER_HOME}
|
||||||
|
|
||||||
RUN sudo apt-get update \
|
RUN apt-get update \
|
||||||
&& wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
|
&& wget -qO- https://dcm.dev/pgp-key.public | gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
|
||||||
&& echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list \
|
&& echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | tee /etc/apt/sources.list.d/dart_stable.list \
|
||||||
&& sudo apt-get update \
|
&& apt-get update \
|
||||||
&& sudo apt-get install dcm -y
|
&& apt-get install dcm -y
|
||||||
|
|
||||||
COPY --chmod=777 ../.devcontainer/mobile/container-mobile-post-create.sh /immich-devcontainer/container-mobile-post-create.sh
|
|
||||||
|
|
||||||
|
USER $SERVER_USER:$SERVER_GROUP
|
||||||
RUN dart --disable-analytics
|
RUN dart --disable-analytics
|
||||||
|
|
||||||
FROM dev AS prod
|
FROM dev AS prod
|
||||||
|
|
||||||
|
USER 0:0
|
||||||
COPY server .
|
COPY server .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
RUN npm prune --omit=dev --omit=optional
|
RUN npm prune --omit=dev --omit=optional
|
||||||
@ -85,6 +92,7 @@ COPY --from=dev /usr/src/app/server/node_modules/exiftool-vendored.pl ./node_mod
|
|||||||
# web build
|
# web build
|
||||||
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web
|
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web
|
||||||
|
|
||||||
|
USER 0:0
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
COPY ./web ./web/
|
COPY ./web ./web/
|
||||||
COPY ./i18n ./i18n/
|
COPY ./i18n ./i18n/
|
||||||
|
|||||||
@ -1,15 +1,16 @@
|
|||||||
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e
|
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e
|
||||||
|
|
||||||
WORKDIR /usr/src/app/web
|
ARG WEB_USER=1000
|
||||||
COPY ./web/package* ./
|
ARG WEB_GROUP=1000
|
||||||
|
|
||||||
RUN apk add --no-cache tini bash && \
|
RUN apk add --no-cache tini bash
|
||||||
echo "umask 000" | tee /etc/profile /etc/bash.bashrc >/dev/null && \
|
|
||||||
chmod o+wx /usr/src/app && \
|
USER $WEB_USER:$WEB_GROUP
|
||||||
chmod o+wx /usr/src/app/web
|
WORKDIR /usr/src/app/web
|
||||||
|
COPY --chown=${WEB_USER}:${WEB_GROUP} ./web/package* ./
|
||||||
|
|
||||||
WORKDIR /usr/src/app/web
|
WORKDIR /usr/src/app/web
|
||||||
RUN umask 000 && npm ci
|
RUN npm ci
|
||||||
|
|
||||||
ENV CHOKIDAR_USEPOLLING=true \
|
ENV CHOKIDAR_USEPOLLING=true \
|
||||||
PATH="${PATH}:/usr/src/app/web/bin"
|
PATH="${PATH}:/usr/src/app/web/bin"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user