diff --git a/Dockerfile b/Dockerfile index 63e65bd..7b82d73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,8 @@ RUN apk add --no-cache \ # to get around errors from differing stack sizes in musl # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Thread_stack_size -#RUN npm config set unsafe-perm true -#RUN npm install -g webpack webpack-cli -RUN yarn global add webpack webpack-cli +RUN npm config set unsafe-perm true +RUN npm install -g webpack webpack-cli ENV WIKIJS_VERSION=2.2.51 @@ -20,16 +19,13 @@ ADD nextcloud-auth.patch /build/nextcloud-auth.patch WORKDIR /build RUN git apply nextcloud-auth.patch -#RUN npm install --production -#RUN make build -RUN yarn cache clean -RUN yarn --non-interactive -RUN yarn build -RUN rm -rf ./node_modules -RUN yarn --production --non-interactive +RUN npm install +RUN make build FROM thallian/confd-env:latest +ENV NODE_ENV=PRODUCTION + RUN addgroup -g 2222 wikijs RUN adduser -h /home/wikijs -S -D -u 2222 -G wikijs wikijs