diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-08-09 13:16:51 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-08-09 13:16:51 +0300 |
commit | 82a6b4245cb18c63220bd785fd3ce9473377d788 (patch) | |
tree | 1f9e16d3de339c861ed3af24f4ace88559625fe8 /Dockerfile | |
parent | 0416fbdcc44a037aa458d620815b001af776fd2e (diff) | |
parent | ae5ea46d7f924ab6a99ec901aa2342c1f31c91e2 (diff) | |
download | wekan-82a6b4245cb18c63220bd785fd3ce9473377d788.tar.gz wekan-82a6b4245cb18c63220bd785fd3ce9473377d788.tar.bz2 wekan-82a6b4245cb18c63220bd785fd3ce9473377d788.zip |
Merge branch 'devel'
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -10,12 +10,17 @@ ARG NPM_VERSION ARG FIBERS_VERSION ARG ARCHITECTURE ARG SRC_PATH +ARG WITH_API +ARG MATOMO_ADDRESS +ARG MATOMO_SITE_ID +ARG MATOMO_DO_NOT_TRACK +ARG MATOMO_WITH_USERNAME # Set the environment variables (defaults where required) # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" -ENV NODE_VERSION ${NODE_VERSION:-v8.11.3} +ENV NODE_VERSION ${NODE_VERSION:-v8.12.0} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} @@ -23,6 +28,12 @@ ENV NPM_VERSION ${NPM_VERSION:-latest} ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} +ENV WITH_API ${WITH_API:-true} +ENV MATOMO_ADDRESS ${MATOMO_ADDRESS:-} +ENV MATOMO_SITE_ID ${MATOMO_SITE_ID:-} +ENV MATOMO_DO_NOT_TRACK ${MATOMO_DO_NOT_TRACK:-false} +ENV MATOMO_WITH_USERNAME ${MATOMO_WITH_USERNAME:-true} + # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app @@ -45,10 +56,10 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm + # Download node version 8.12.0 prerelease that has fix included, # Description at https://releases.wekan.team/node.txt wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - echo "40e7990489c13a1ed1173d8fe03af258c6ed964b92a4bd59a0927ac5931054aa node-v8.11.3-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795 node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ \ # Verify nodejs authenticity grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ @@ -144,7 +155,8 @@ RUN \ rm -R /home/wekan/app_build && \ rm /home/wekan/install_meteor.sh -ENV PORT=80 +ENV PORT=8080 EXPOSE $PORT +USER wekan CMD ["node", "/build/main.js"] |