From c9ed95c3a8410c82d66ccfe598ca48c569b30d89 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 5 Apr 2020 12:11:56 +0200 Subject: [PATCH] push to version 2.2.51 --- Dockerfile | 3 +-- nextcloud-auth.patch | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b0958d..77e4925 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,13 +12,12 @@ RUN apk add --no-cache \ RUN npm config set unsafe-perm true RUN npm install -g webpack webpack-cli -ENV WIKIJS_VERSION=2.0.12 +ENV WIKIJS_VERSION=2.2.51 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build ADD nextcloud-auth.patch /build/nextcloud-auth.patch WORKDIR /build -#RUN git checkout $WIKIJS_VERSION RUN git apply nextcloud-auth.patch RUN npm install RUN make build diff --git a/nextcloud-auth.patch b/nextcloud-auth.patch index 2fd27cb..48baa0d 100644 --- a/nextcloud-auth.patch +++ b/nextcloud-auth.patch @@ -15,8 +15,8 @@ diff --git a/package.json b/package.json index c4ce2a63..b78ef485 100644 --- a/package.json +++ b/package.json -@@ -132,6 +132,7 @@ - "passport-ldapauth": "2.1.3", +@@ -137,6 +137,7 @@ + "passport-ldapauth": "2.1.4", "passport-local": "1.0.0", "passport-microsoft": "0.0.5", + "passport-nextcloud": "0.1.1", @@ -96,6 +96,6 @@ index 00000000..30a136ed + title: Base URL + hint: Define the base URL (e.g. https://nextcloud.example.com). + order: 3 --- +-- 2.18.1