container/wikijs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push to version 2.2.51

Browse Source
This commit is contained in:
Sebastian Hugentobler 2020-04-05 12:11:56 +02:00
parent 253f38489a
commit c9ed95c3a8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -12,13 +12,12 @@ RUN apk add --no-cache \
RUN npm config set unsafe-perm true RUN npm config set unsafe-perm true
RUN npm install -g webpack webpack-cli 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 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build
ADD nextcloud-auth.patch /build/nextcloud-auth.patch ADD nextcloud-auth.patch /build/nextcloud-auth.patch
WORKDIR /build WORKDIR /build
#RUN git checkout $WIKIJS_VERSION
RUN git apply nextcloud-auth.patch RUN git apply nextcloud-auth.patch
RUN npm install RUN npm install
RUN make build RUN make build

4
nextcloud-auth.patch
View File

@ -15,8 +15,8 @@ diff --git a/package.json b/package.json
index c4ce2a63..b78ef485 100644 index c4ce2a63..b78ef485 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -132,6 +132,7 @@ @@ -137,6 +137,7 @@
"passport-ldapauth": "2.1.3", "passport-ldapauth": "2.1.4",
"passport-local": "1.0.0", "passport-local": "1.0.0",
"passport-microsoft": "0.0.5", "passport-microsoft": "0.0.5",
+ "passport-nextcloud": "0.1.1", + "passport-nextcloud": "0.1.1",