push to 2.5.299

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/alpine:3.17 as builder
+FROM docker.io/alpine:3.18 as builder
 
 RUN apk add --no-cache \
   git \
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
   bash \
   python3 \
   make \
-	sed
+  sed
 
 #ENV NODE_ENV=production
 
@@ -15,11 +15,11 @@ RUN apk add --no-cache \
 #RUN npm config set unsafe-perm true
 ENV NODE_OPTIONS=--openssl-legacy-provider
 RUN npm install -g \
-    webpack \
-    webpack-cli \
-    node-gyp
+  webpack \
+  webpack-cli \
+  node-gyp
 
-ENV WIKIJS_VERSION=v2.5.294
+ENV WIKIJS_VERSION=v2.5.299
 
 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build
 
@@ -30,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.17
+FROM docker.io/thallian/confd-env:3.18-3.1.5.0
 
 ENV NODE_ENV=production