From b9bcb8f9797dc2f90067ff5e7428a667aae9f669 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 30 Jul 2018 22:07:17 +0300 Subject: Try to fix glibc in Dockerfile. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 4268e472..19bc150b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG SRC_PATH # 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 BUILD_DEPS="glibc apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" ENV NODE_VERSION ${NODE_VERSION:-v8.11.3} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} -- cgit v1.2.3-1-g7c22 From 6a23f73d94ad6b4136e815c61b0bf132b8e476e1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 30 Jul 2018 22:10:49 +0300 Subject: Reverting change, Docker container did not build. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 19bc150b..4268e472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG SRC_PATH # 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="glibc apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" +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 METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} -- cgit v1.2.3-1-g7c22 From 53d545eeef7e796bd910f7cce666686ca05de544 Mon Sep 17 00:00:00 2001 From: Thibaut Demaret Date: Thu, 2 Aug 2018 15:09:34 +0200 Subject: Change Run User for Openshift compliance --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 4268e472..bfdce234 100644 --- a/Dockerfile +++ b/Dockerfile @@ -144,7 +144,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"] -- cgit v1.2.3-1-g7c22 From 04d7c47f4ca990311079be8dd6dc383448ee342f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 4 Aug 2018 21:47:02 +0300 Subject: Update node to v8.12.0 prerelease build. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index bfdce234..593e9909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SRC_PATH # 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} @@ -45,10 +45,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 - && \ -- cgit v1.2.3-1-g7c22 From 445aa89e4f7b41eb94902d75dfd3fc2074d1e950 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 9 Aug 2018 12:46:19 +0300 Subject: - Use new WITH_API and Matomo env variables at Dockerfile. Closes #1820 --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 593e9909..39002070 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,11 @@ 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 @@ -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 -- cgit v1.2.3-1-g7c22