From 744bcd80b9df96ce92ea1e14a01ed6cbfc1bd2b9 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 18 Sep 2020 16:38:51 +0200 Subject: [PATCH] push to 2.5.144 --- Dockerfile | 12 ++++++++---- nextcloud-auth.patch | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c90acf8..fed06ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,20 @@ RUN apk add --no-cache \ git \ npm \ bash \ - python3 + python3 \ + make #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 install -g webpack webpack-cli node-gyp +RUN npm install -g \ + webpack \ + webpack-cli \ + node-gyp -ENV WIKIJS_VERSION=2.2.51 +ENV WIKIJS_VERSION=2.5.144 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build ADD nextcloud-auth.patch /build/nextcloud-auth.patch @@ -21,7 +25,7 @@ ADD nextcloud-auth.patch /build/nextcloud-auth.patch WORKDIR /build RUN git apply nextcloud-auth.patch RUN npm install -# don't why this is needed here too, but what the hell +# don't know why this is needed here too, but what the hell RUN npm install --save-dev webpack webpack-cli RUN npx webpack --profile --config dev/webpack/webpack.prod.js diff --git a/nextcloud-auth.patch b/nextcloud-auth.patch index 48baa0d..c456249 100644 --- a/nextcloud-auth.patch +++ b/nextcloud-auth.patch @@ -12,13 +12,13 @@ Subject: [PATCH] add nextcloud auth create mode 100644 server/modules/authentication/nextcloud/definition.yml diff --git a/package.json b/package.json -index c4ce2a63..b78ef485 100644 +index 3ca42c3a..c92ec776 100644 --- a/package.json +++ b/package.json -@@ -137,6 +137,7 @@ +@@ -146,6 +146,7 @@ "passport-ldapauth": "2.1.4", "passport-local": "1.0.0", - "passport-microsoft": "0.0.5", + "passport-microsoft": "0.1.0", + "passport-nextcloud": "0.1.1", "passport-oauth2": "1.5.0", "passport-okta-oauth": "0.0.1",