From c3824dcbd203005403d53318d0cbded0e5817c9b Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 4 Apr 2022 08:03:58 +0200 Subject: [PATCH 01/15] .devcontainer, added missing environments --- .devcontainer/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0063e5ec3..abfc32a48 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="sgr" # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, # so changing to 21.10. https://github.com/wekan/wekan/issues/4488 -ENV BUILD_DEPS="gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2" +ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2" ENV DEBIAN_FRONTEND=noninteractive ENV \ @@ -30,7 +30,6 @@ ENV \ ACCOUNTS_COMMON_LOGIN_EXPIRATION_IN_DAYS=90 \ RICHER_CARD_COMMENT_EDITOR=false \ CARD_OPENED_WEBHOOK_ENABLED=false \ - ATTACHMENTS_STORE_PATH="" \ ATTACHMENTS_UPLOAD_EXTERNAL_PROGRAM="" \ ATTACHMENTS_UPLOAD_MIME_TYPES="" \ ATTACHMENTS_UPLOAD_MAX_SIZE=0 \ @@ -71,6 +70,9 @@ ENV \ LDAP_ENABLE=false \ LDAP_PORT=389 \ LDAP_HOST="" \ + LDAP_AD_SIMPLE_AUTH="" \ + LDAP_USER_AUTHENTICATION=false \ + LDAP_USER_AUTHENTICATION_FIELD=uid \ LDAP_BASEDN="" \ LDAP_LOGIN_FALLBACK=false \ LDAP_RECONNECT=true \ @@ -88,8 +90,6 @@ ENV \ LDAP_ENCRYPTION=false \ LDAP_CA_CERT="" \ LDAP_REJECT_UNAUTHORIZED=false \ - LDAP_USER_AUTHENTICATION=false \ - LDAP_USER_AUTHENTICATION_FIELD=uid \ LDAP_USER_SEARCH_FILTER="" \ LDAP_USER_SEARCH_SCOPE="" \ LDAP_USER_SEARCH_FIELD="" \ @@ -144,7 +144,8 @@ ENV \ SAML_IDENTIFIER_FORMAT="" \ SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \ SAML_ATTRIBUTES="" \ - DEFAULT_WAIT_SPINNER="" \ + ORACLE_OIM_ENABLED=false \ + WAIT_SPINNER="" \ S3="" # \ # NODE_OPTIONS="--max_old_space_size=4096" @@ -161,6 +162,7 @@ ENV \ RUN set -o xtrace \ && useradd --user-group -m --system --home-dir /home/wekan wekan \ && apt-get update \ + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} && \ && apt-get install --assume-yes --no-install-recommends apt-utils apt-transport-https ca-certificates 2>&1 \ && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} From 58782c9a895e002d813e7abe98d17ef83ae13f80 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 6 Apr 2022 13:15:49 +0200 Subject: [PATCH 02/15] .devcontainer/Dockerfile contained duplicated logic --- .devcontainer/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index abfc32a48..619fe7e3a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -162,8 +162,6 @@ ENV \ RUN set -o xtrace \ && useradd --user-group -m --system --home-dir /home/wekan wekan \ && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} && \ - && apt-get install --assume-yes --no-install-recommends apt-utils apt-transport-https ca-certificates 2>&1 \ && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} # OLD: From 89e5b3a9794091f6d50c69095a6bed5802d3e172 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 11 Apr 2022 13:20:32 +0200 Subject: [PATCH 03/15] .devcontainer/Dockerfile, 6.02 GB image size --- .devcontainer/Dockerfile | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 619fe7e3a..62a28cdb6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -236,28 +236,23 @@ USER root RUN set -o xtrace \ && chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor -USER wekan - RUN \ set -o xtrace && \ + cd /home/wekan/.meteor && \ + gosu wekan:wekan /home/wekan/.meteor/meteor -- help && \ + # Build app cd /home/wekan/app && \ - /home/wekan/.meteor/meteor add standard-minifier-js && \ - /home/wekan/.meteor/meteor npm install && \ - /home/wekan/.meteor/meteor build --directory /home/wekan/app_build - -RUN \ - set -o xtrace && \ + gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ + gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ + gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cd /home/wekan/app_build/bundle/programs/server/ && \ chmod u+w package.json npm-shrinkwrap.json && \ - npm install && \ + gosu wekan:wekan npm install && \ cd node_modules/fibers && \ - node build.js + gosu wekan:wekan node build.js && \ -USER root -# Cleanup -RUN \ - set -o xtrace && \ + # Cleanup apt-get clean -y && \ apt-get autoremove -y && \ rm -Rf /tmp/* && \ From 7c36279308debba9c9373a38d0dc78fe53743def Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 25 Apr 2022 14:37:38 +0200 Subject: [PATCH 04/15] .devcontainer/Dockerfile, 5.64 GB image size --- .devcontainer/Dockerfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 62a28cdb6..eed91f5fc 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -201,8 +201,6 @@ USER root RUN echo "export PATH=$PATH" >> /etc/environment -USER wekan - # Copy source dir RUN set -o xtrace \ && mkdir -p /home/wekan/app/.meteor \ @@ -231,13 +229,8 @@ COPY \ packages \ /home/wekan/app/packages/ -USER root - -RUN set -o xtrace \ - && chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor - -RUN \ - set -o xtrace && \ +RUN set -o xtrace && \ + chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help && \ From 9ca39696b3750678dc74efc3aaf1bd8712216ab3 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Thu, 3 Aug 2023 09:10:17 +0200 Subject: [PATCH 05/15] .devcontainer/Dockerfile, 5.64 GB image size - first copy all files, then install to make it possible to install everything in one RUN section --- .devcontainer/Dockerfile | 75 +++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index eed91f5fc..b79ea6a6a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -158,47 +158,8 @@ ENV \ # bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" #--------------------------------------------------------------------- -# Install OS -RUN set -o xtrace \ - && useradd --user-group -m --system --home-dir /home/wekan wekan \ - && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} - -# OLD: -# && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ -# && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \ - -# Install NodeJS -RUN set -o xtrace \ - && cd /tmp \ - && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.xz" \ - && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt" \ - && grep " node-$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \ - && npm install -g npm@${NPM_VERSION} \ - && chown wekan:wekan --recursive /home/wekan/.config - -ENV DEBIAN_FRONTEND=dialog - -USER wekan - -# Install Meteor -RUN set -o xtrace \ - && cd /home/wekan \ - && curl https://install.meteor.com/?release=$METEOR_VERSION --output /home/wekan/install-meteor.sh \ - # Replace tar with bsdtar in the install script; https://github.com/jshimko/meteor-launchpad/issues/39 - && sed --in-place "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /home/wekan/install-meteor.sh \ - && sed --in-place 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' /home/wekan/install-meteor.sh \ - && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \ - && sh /home/wekan/install-meteor.sh - ENV PATH=$PATH:/home/wekan/.meteor/ -USER root - RUN echo "export PATH=$PATH" >> /etc/environment # Copy source dir @@ -229,7 +190,41 @@ COPY \ packages \ /home/wekan/app/packages/ -RUN set -o xtrace && \ +# Install OS +RUN set -o xtrace \ + && useradd --user-group --no-create-home --system --home-dir /home/wekan wekan \ + && apt-get update \ + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} + +# OLD: +# && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ +# && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \ + +# Install NodeJS +RUN set -o xtrace \ + && cd /tmp \ + && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.xz" \ + && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt" \ + && grep " node-$NODE_VERSION-$ARCHITECTURE.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-$NODE_VERSION-$ARCHITECTURE.tar.xz" SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \ + && npm install -g npm@${NPM_VERSION} \ + && chown wekan:wekan --recursive /home/wekan/.config + +# Install Meteor +RUN set -o xtrace \ + && cd /home/wekan \ + && curl https://install.meteor.com/?release=$METEOR_VERSION --output /home/wekan/install-meteor.sh \ + # Replace tar with bsdtar in the install script; https://github.com/jshimko/meteor-launchpad/issues/39 + && sed --in-place "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /home/wekan/install-meteor.sh \ + && sed --in-place 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' /home/wekan/install-meteor.sh \ + && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \ + && chown wekan:wekan -R /home/wekan \ + && gosu wekan:wekan sh /home/wekan/install-meteor.sh + +RUN set -o xtrace && \ chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help && \ From 4ab72170e320de4c1172ae960a636cf0921becaf Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 25 Apr 2022 16:29:23 +0200 Subject: [PATCH 06/15] .devcontainer/Dockerfile, 4.16 GB image size --- .devcontainer/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b79ea6a6a..8d31f2c22 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -222,9 +222,8 @@ RUN set -o xtrace \ && sed --in-place 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' /home/wekan/install-meteor.sh \ && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \ && chown wekan:wekan -R /home/wekan \ - && gosu wekan:wekan sh /home/wekan/install-meteor.sh + && gosu wekan:wekan sh /home/wekan/install-meteor.sh && \ -RUN set -o xtrace && \ chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help && \ From 669e31ea64e01d941a749b84d9e0ebb61d6bd7f0 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Apr 2022 09:58:57 +0200 Subject: [PATCH 07/15] .devcontainer/Dockerfile, 4.16 GB image size --- .devcontainer/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8d31f2c22..e427b75b1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -211,10 +211,9 @@ RUN set -o xtrace \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ && mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config \ && npm install -g npm@${NPM_VERSION} \ - && chown wekan:wekan --recursive /home/wekan/.config + && chown wekan:wekan --recursive /home/wekan/.config \ # Install Meteor -RUN set -o xtrace \ && cd /home/wekan \ && curl https://install.meteor.com/?release=$METEOR_VERSION --output /home/wekan/install-meteor.sh \ # Replace tar with bsdtar in the install script; https://github.com/jshimko/meteor-launchpad/issues/39 From 672c279b0a55672e6510df18d145d61f5abd4b0a Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Apr 2022 10:13:37 +0200 Subject: [PATCH 08/15] .devcontainer/Dockerfile, 4.12 GB image size --- .devcontainer/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e427b75b1..4347c9550 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -194,14 +194,13 @@ COPY \ RUN set -o xtrace \ && useradd --user-group --no-create-home --system --home-dir /home/wekan wekan \ && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} \ # OLD: # && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ # && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt.asc" \ # Install NodeJS -RUN set -o xtrace \ && cd /tmp \ && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.xz" \ && curl -fsSLO --compressed "https://github.com/wekan/node-v14-esm/releases/download/${NODE_VERSION}/SHASUMS256.txt" \ From 19d204c7a8b3e4f8b5140554281c285096befd02 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Apr 2022 11:47:16 +0200 Subject: [PATCH 09/15] .devcontainer/Dockerfile, 3.49 GB image size --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4347c9550..234ca5be0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -238,6 +238,7 @@ RUN set -o xtrace \ gosu wekan:wekan node build.js && \ # Cleanup + apt-get remove --purge --assume-yes ${BUILD_DEPS} && \ apt-get clean -y && \ apt-get autoremove -y && \ rm -Rf /tmp/* && \ From b5b323000a6b7e427a6cadf023096f6de80ac795 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Apr 2022 13:40:16 +0200 Subject: [PATCH 10/15] .devcontainer/Dockerfile, reduce build a bit + image size to 3.42 GB - on a test system it reduced from 11m36s to 9m34s --- .devcontainer/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 234ca5be0..3c43ef928 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -230,12 +230,6 @@ RUN set -o xtrace \ cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ - gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ - cd /home/wekan/app_build/bundle/programs/server/ && \ - chmod u+w package.json npm-shrinkwrap.json && \ - gosu wekan:wekan npm install && \ - cd node_modules/fibers && \ - gosu wekan:wekan node build.js && \ # Cleanup apt-get remove --purge --assume-yes ${BUILD_DEPS} && \ From 7dc20616a77af235c1c7af45985892ac1cfa1a46 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 27 Apr 2022 15:14:52 +0200 Subject: [PATCH 11/15] .devcontainer/Dockerfile, don't remove curl/python3 because it's needed for "meteor npm" --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3c43ef928..4f9d7ae9c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="sgr" # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, # so changing to 21.10. https://github.com/wekan/wekan/issues/4488 -ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2" +ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget bzip2 g++ build-essential git ca-certificates iproute2" ENV DEBIAN_FRONTEND=noninteractive ENV \ @@ -194,7 +194,7 @@ COPY \ RUN set -o xtrace \ && useradd --user-group --no-create-home --system --home-dir /home/wekan wekan \ && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} \ + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} curl python3 \ # OLD: # && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ From e7e1f1b6679772ea4e359993f07a665190edee95 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Thu, 16 Jun 2022 10:07:59 +0200 Subject: [PATCH 12/15] .devcontainer/Dockerfile, don't remove ca-certificates because it's needed for "meteor npm install" --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4f9d7ae9c..ab35e903c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="sgr" # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, # so changing to 21.10. https://github.com/wekan/wekan/issues/4488 -ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget bzip2 g++ build-essential git ca-certificates iproute2" +ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget bzip2 g++ build-essential git iproute2" ENV DEBIAN_FRONTEND=noninteractive ENV \ @@ -194,7 +194,7 @@ COPY \ RUN set -o xtrace \ && useradd --user-group --no-create-home --system --home-dir /home/wekan wekan \ && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} curl python3 \ + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} curl python3 ca-certificates \ # OLD: # && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ From 6f2c46a747580c4947ac4af1c6d55894c7d1c0e3 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 16 Jul 2022 09:41:43 +0200 Subject: [PATCH 13/15] .devcontainer/Dockerfile, make is needed by "meteor npm update" --- .devcontainer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ab35e903c..8c9135b0e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="sgr" # - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling, # so changing to 21.10. https://github.com/wekan/wekan/issues/4488 -ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget bzip2 g++ build-essential git iproute2" +ENV BUILD_DEPS="apt-utils apt-transport-https gnupg gosu libarchive-tools wget bzip2 g++ git iproute2" ENV DEBIAN_FRONTEND=noninteractive ENV \ @@ -194,7 +194,7 @@ COPY \ RUN set -o xtrace \ && useradd --user-group --no-create-home --system --home-dir /home/wekan wekan \ && apt-get update \ - && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} curl python3 ca-certificates \ + && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPS} curl python3 ca-certificates build-essential \ # OLD: # && curl -fsSLO --compressed "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$ARCHITECTURE.tar.xz" \ @@ -233,6 +233,7 @@ RUN set -o xtrace \ # Cleanup apt-get remove --purge --assume-yes ${BUILD_DEPS} && \ + apt-get install --assume-yes --no-install-recommends build-essential && \ apt-get clean -y && \ apt-get autoremove -y && \ rm -Rf /tmp/* && \ From 68104fe5787a37a89fb2b5b75807c482de07b9a5 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Fri, 5 Aug 2022 20:39:34 +0200 Subject: [PATCH 14/15] .devcontainer/Dockerfile, use Debian 11 because Ubuntu 21.10 can not build --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8c9135b0e..34b72fd7c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:21.10 +FROM debian:11 LABEL maintainer="sgr" # 2022-04-25: From 2b4f4c8d4dd37d877d533332395b85cf60d9f430 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Sat, 25 May 2024 19:34:13 +0200 Subject: [PATCH 15/15] .devcontainer/Dockerfile, updated RUN statements to heredoc style --- .devcontainer/Dockerfile | 94 +++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 34b72fd7c..d6dcb92de 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -160,12 +160,16 @@ ENV \ ENV PATH=$PATH:/home/wekan/.meteor/ -RUN echo "export PATH=$PATH" >> /etc/environment +RUN <> /etc/environment +EOR # Copy source dir -RUN set -o xtrace \ - && mkdir -p /home/wekan/app/.meteor \ - && mkdir -p /home/wekan/app/packages +RUN <