diff --git a/Dockerfile b/Dockerfile index 800ae74..c13afda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,36 @@ RUN apk add --update --no-cache \ dumb-init \ git \ jq + WORKDIR "/home/node" + ARG WIKI_PACKAGE=wiki@0.28.0 -RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE" -RUN su node -c "cd lib/node_modules/wiki/node_modules && rm -r wiki-security-passportjs && git clone https://git.coopcloud.tech/3wordchant/wiki-security-passportjs.git" -RUN su node -c "cd lib/node_modules/wiki/node_modules/wiki-security-passportjs && npm install && node_modules/grunt/bin/grunt" -RUN su node -c "mkdir -p .wiki" -VOLUME "/home/node/.wiki" -EXPOSE 3000 + USER node + +RUN npm install -g --prefix . $WIKI_PACKAGE +RUN cd lib/node_modules/wiki/node_modules && \ + rm -r wiki-security-passportjs && \ + git clone https://git.coopcloud.tech/3wordchant/wiki-security-passportjs.git + +RUN cd lib/node_modules/wiki/node_modules/wiki-security-passportjs && \ + npm install + +RUN cd lib/node_modules/wiki/node_modules/wiki-security-passportjs && \ + npm install git+https://git.coopcloud.tech/wiki-cafe/node-oauth.git && \ + node_modules/grunt/bin/grunt && \ + rm -r ../oauth node_modules/passport-oauth2/node_modules/oauth node_modules/passport-twitter/node_modules/oauth + +RUN mkdir -p .wiki + +VOLUME "/home/node/.wiki" + +EXPOSE 3000 + ENV PATH="${PATH}:/home/node/bin" + ENV NPM_CONFIG_PREFIX="${HOME}" + ENTRYPOINT ["dumb-init"] + CMD ["wiki", "--farm"]