From 6622dbb56b4f92e5b0629d175aec5cc14661cf8d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 00:18:59 +0200 Subject: Meteor 1.6.0.1, Node 8.9.3, NPM 5.5.1, fibers 2.0.0 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 70f1af2f..77f26835 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,12 @@ ARG SRC_PATH # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl" ENV GOSU_VERSION=1.10 -ENV NODE_VERSION ${NODE_VERSION:-v4.8.7} -ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1} +ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} -ENV NPM_VERSION ${NPM_VERSION:-4.6.1} -ENV FIBERS_VERSION ${FIBERS_VERSION:-1.0.15} +ENV NPM_VERSION ${NPM_VERSION:-5.5.1} +ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} -- cgit v1.2.3-1-g7c22 From d79bb1a81cc439d9fefc6bf962b978f77aefba02 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 14:37:34 +0200 Subject: Try to fix Docker and Snap: add apt-utils, remove sed bson. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 77f26835..111f4697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG SRC_PATH # Set the environment variables (defaults where required) # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 -ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl" +ENV BUILD_DEPS="apt-utils wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl" ENV GOSU_VERSION=1.10 ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} @@ -119,7 +119,6 @@ RUN \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ - gosu wekan:wekan sed -i "s|build\/Release\/bson|browser_build\/bson|g" /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js && \ cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ gosu wekan:wekan rm -rf node_modules/bcrypt && \ gosu wekan:wekan npm install bcrypt && \ -- cgit v1.2.3-1-g7c22 From 52aa22f36a1d561ac9a8be78fbd863897031bf11 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 16:53:39 +0200 Subject: Try Debian 10 buster with Docker --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 111f4697..b1ae2f6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie-slim +FROM debian:buster-slim MAINTAINER wekan # Declare Arguments @@ -13,7 +13,7 @@ ARG SRC_PATH # Set the environment variables (defaults where required) # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 -ENV BUILD_DEPS="apt-utils wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl" +ENV BUILD_DEPS="apt-utils gnupg wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl" ENV GOSU_VERSION=1.10 ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} -- cgit v1.2.3-1-g7c22 From b2c9d47b0f7b6ab96857659a9f038e66dfdee9fc Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 16:59:36 +0200 Subject: Removed dist-upgrade from Dockerfile, trying to fix docker build. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b1ae2f6e..5bab9c1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN \ useradd --user-group --system --home-dir /home/wekan wekan && \ \ # OS dependencies - apt-get update -y && apt-get dist-upgrade -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ + apt update -y && apt install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Gosu installation GOSU_ARCHITECTURE="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \ -- cgit v1.2.3-1-g7c22 From d2ce41694fcea2358ab0e7d42039fb3c7c7bdb4a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 17:17:28 +0200 Subject: Dockerfile apt => apt-get --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 5bab9c1f..4a77a484 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN \ useradd --user-group --system --home-dir /home/wekan wekan && \ \ # OS dependencies - apt update -y && apt install -y --no-install-recommends ${BUILD_DEPS} && \ + apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Gosu installation GOSU_ARCHITECTURE="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \ -- cgit v1.2.3-1-g7c22 From 6e25ef73b025edbd827ba143130b41c3937a4d80 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 17:22:16 +0200 Subject: Use Debian package version of gosu --- Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 4a77a484..6267653d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,7 @@ ARG SRC_PATH # Set the environment variables (defaults where required) # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 -ENV BUILD_DEPS="apt-utils gnupg wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl" -ENV GOSU_VERSION=1.10 +ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl" ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} @@ -34,16 +33,6 @@ RUN \ # OS dependencies apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ - # Gosu installation - GOSU_ARCHITECTURE="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${GOSU_ARCHITECTURE}" && \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${GOSU_ARCHITECTURE}.asc" && \ - export GNUPGHOME="$(mktemp -d)" && \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \ - rm -R "$GNUPGHOME" /usr/local/bin/gosu.asc && \ - chmod +x /usr/local/bin/gosu && \ - \ # Download nodejs wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \ -- cgit v1.2.3-1-g7c22 From ec0bbe9e142624544977dc8afbb10fb7e2211b54 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 17:54:19 +0200 Subject: Try Debian experimental with Docker, does it work or fix bugs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 6267653d..acbf0254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:experimental MAINTAINER wekan # Declare Arguments -- cgit v1.2.3-1-g7c22 From 91e738bd32366c3bfee327ad405783984ff1beb0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 22 Jan 2018 18:46:53 +0200 Subject: Go back using debian buster-slim Docker base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index acbf0254..6267653d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:experimental +FROM debian:buster-slim MAINTAINER wekan # Declare Arguments -- cgit v1.2.3-1-g7c22