From 25cf78b2d6719b80c325b5b677d8b97080e48379 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 19 Dec 2022 11:04:00 +0100 Subject: [PATCH] push to 2.5.294 --- Dockerfile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d69d48..245e91e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,25 @@ -FROM docker.io/alpine:3.16 as builder +FROM docker.io/alpine:3.17 as builder RUN apk add --no-cache \ - git \ - npm \ - bash \ - python3 \ - make \ + git \ + npm \ + bash \ + python3 \ + make \ sed #ENV NODE_ENV=production # 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 config set unsafe-perm true +ENV NODE_OPTIONS=--openssl-legacy-provider RUN npm install -g \ webpack \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.291 +ENV WIKIJS_VERSION=v2.5.294 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build @@ -29,7 +30,7 @@ RUN npm install --legacy-peer-deps --save-dev webpack webpack-cli RUN npx webpack --profile --config dev/webpack/webpack.prod.js RUN sed -i '0,/.*"dev".*/s//"dev": false,/' package.json -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 ENV NODE_ENV=production @@ -44,9 +45,9 @@ COPY --from=builder --chown=wikijs:wikijs /build/config.sample.yml /home/wikijs/ COPY --from=builder --chown=wikijs:wikijs /build/package.json /home/wikijs/package.json RUN apk add --no-cache \ - nodejs \ - git \ - openssh-client + nodejs \ + git \ + openssh-client ADD /rootfs /