push to 2.5.294

This commit is contained in:
Sebastian Hugentobler 2022-12-19 11:04:00 +01:00
parent d51547dab4
commit 25cf78b2d6
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0

View File

@ -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 \ RUN apk add --no-cache \
git \ git \
npm \ npm \
bash \ bash \
python3 \ python3 \
make \ make \
sed sed
#ENV NODE_ENV=production #ENV NODE_ENV=production
# to get around errors from differing stack sizes in musl # to get around errors from differing stack sizes in musl
# https://wiki.musl-libc.org/functional-differences-from-glibc.html#Thread_stack_size # 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 \ RUN npm install -g \
webpack \ webpack \
webpack-cli \ webpack-cli \
node-gyp 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 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 npx webpack --profile --config dev/webpack/webpack.prod.js
RUN sed -i '0,/.*"dev".*/s//"dev": false,/' package.json 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 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 COPY --from=builder --chown=wikijs:wikijs /build/package.json /home/wikijs/package.json
RUN apk add --no-cache \ RUN apk add --no-cache \
nodejs \ nodejs \
git \ git \
openssh-client openssh-client
ADD /rootfs / ADD /rootfs /