From 0d3002f69d97e646fa7368bfdade4f78c51e9884 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 1 Mar 2020 20:33:23 +0200 Subject: Try to make Meteor build time shorter by excluding legacy and cordova. Thanks to xet7 ! --- Dockerfile | 4 ++-- rebuild-wekan.bat | 2 +- rebuild-wekan.sh | 2 +- releases/rebuild-release.sh | 2 +- snapcraft.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e548c15b..ae609f38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="wekan" ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ DEBUG=false \ NODE_VERSION=v12.16.1 \ - METEOR_RELEASE=1.9.0 \ + METEOR_RELEASE=1.10-rc.2 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ @@ -249,7 +249,7 @@ RUN \ chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \ #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan npm install && \ - gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ + gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build --exclude-archs web.browser.legacy,web.cordova && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \ chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 0a9a8eac..e61c20be 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -51,7 +51,7 @@ cd .. REM del /S /F /Q node_modules call meteor npm install REM del /S /F /Q .build -call meteor build .build --directory +call meteor build .build --directory --exclude-archs web.browser.legacy,web.cordova copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js cd .build\bundle\programs\server call meteor npm install diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 957e634f..0bf6c68a 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -146,7 +146,7 @@ do rm -rf node_modules .meteor/local npm install rm -rf .build - meteor build .build --directory + meteor build .build --directory --exclude-archs web.browser.legacy,web.cordova cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh index e8393313..a9619b06 100755 --- a/releases/rebuild-release.sh +++ b/releases/rebuild-release.sh @@ -9,7 +9,7 @@ sudo chown -R $(id -u):$(id -g) $HOME/.npm $HOME/.meteor rm -rf node_modules meteor npm install rm -rf .build -meteor build .build --directory +meteor build .build --directory --exclude-archs web.browser.legacy,web.cordova cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js cd .build/bundle/programs/server rm -rf node_modules diff --git a/snapcraft.yaml b/snapcraft.yaml index 2b6b1ef9..f59e3200 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -206,7 +206,7 @@ parts: meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser meteor npm install --allow-superuser --save babel-runtime - meteor build .build --directory --allow-superuser + meteor build .build --directory --allow-superuser --exclude-archs web.browser.legacy,web.cordova cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac -- cgit v1.2.3-1-g7c22