From 785f3cf88b61f687ef5ad4a529768221d1a54c86 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 Jan 2020 00:04:43 +0200 Subject: Upgrade to Meteor 1.9, Node 12.14.1 and MongoDB 4.2.2. Thanks to xet7 ! --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 2f965fe1..8973b9d9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,7 +65,7 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.2.tgz plugin: dump stage-packages: [libssl1.0.0] filesets: @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.17.0 + node-engine: 12.14.1 node-packages: - node-gyp - node-pre-gyp -- cgit v1.2.3-1-g7c22 From 39bf1e375e2962f824e6f8cfa425ea51aa4efa24 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 Jan 2020 01:31:48 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 8973b9d9..629f5463 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -85,10 +85,11 @@ parts: node-packages: - node-gyp - node-pre-gyp - - fibers@2.0.0 + - fibers build-packages: - ca-certificates - apt-utils + - build-essential - python # - python3 - g++ -- cgit v1.2.3-1-g7c22 From 2b382b940be9af575fab4c2e955702d8cde55ae9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 Jan 2020 02:49:38 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 629f5463..ab93384b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -95,6 +95,7 @@ parts: - g++ - capnproto - curl + - libcurl3 - execstack - nodejs - npm -- cgit v1.2.3-1-g7c22 From e01f4dbf1393a789faaa2f38b53d2effad827e86 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 13:08:29 +0200 Subject: Change Buffer to Buffer.alloc on Node v12. Try to fix Snap. --- snapcraft.yaml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index ab93384b..bb1cb05c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: 0 +version: '0' version-script: git describe --tags | cut -c 2- summary: The open-source kanban description: | @@ -12,6 +12,11 @@ description: | confinement: strict grade: stable +base: core18 + +environment: + npm_config_unsafe_perm: "true" + NODE_ENV: "production" architectures: - amd64 @@ -65,9 +70,9 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.2.tgz + source: https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/4.2/multiverse/binary-amd64/mongodb-org-server_4.2.2_amd64.deb plugin: dump - stage-packages: [libssl1.0.0] + stage-packages: [libssl1.1] filesets: mongo: - usr @@ -81,21 +86,16 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.14.1 - node-packages: - - node-gyp - - node-pre-gyp - - fibers build-packages: - ca-certificates - apt-utils - build-essential - - python -# - python3 +# - python + - python3 - g++ - capnproto - curl - - libcurl3 + - libcurl4 - execstack - nodejs - npm @@ -106,6 +106,11 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build + npm -g install n + n 12.14.1 + npm install -g node-gyp + npm install -g node-pre-gyp + npm install -g fibers #mkdir -p .build/python #cd .build/python #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python -- cgit v1.2.3-1-g7c22 From 870dfc4489259edbbaf4f373129094265001818b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 13:35:27 +0200 Subject: Try to fix snap. --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index bb1cb05c..308927be 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -86,6 +86,7 @@ parts: wekan: source: . plugin: nodejs +# node-engine: 12.14.1 build-packages: - ca-certificates - apt-utils @@ -97,7 +98,7 @@ parts: - curl - libcurl4 - execstack - - nodejs +# - nodejs - npm stage-packages: - libfontconfig1 -- cgit v1.2.3-1-g7c22 From 88ef717793815003b10564dcf4fd86bb19d1d8ee Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 20:19:23 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 308927be..022b49bf 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: wekan -version: '0' +version: 0 version-script: git describe --tags | cut -c 2- summary: The open-source kanban description: | @@ -12,11 +12,6 @@ description: | confinement: strict grade: stable -base: core18 - -environment: - npm_config_unsafe_perm: "true" - NODE_ENV: "production" architectures: - amd64 @@ -70,9 +65,11 @@ apps: parts: mongodb: - source: https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/4.2/multiverse/binary-amd64/mongodb-org-server_4.2.2_amd64.deb + source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.2/multiverse/binary-amd64/mongodb-org-server_4.2.2_amd64.deb + #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.14.tgz + #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump - stage-packages: [libssl1.1] + stage-packages: [libssl1.0.0] filesets: mongo: - usr @@ -86,19 +83,21 @@ parts: wekan: source: . plugin: nodejs -# node-engine: 12.14.1 + node-engine: 12.14.1 + node-packages: + - node-gyp + - node-pre-gyp + - fibers@2.0.0 build-packages: - ca-certificates - apt-utils - - build-essential -# - python - - python3 + - python +# - python3 - g++ - capnproto - curl - - libcurl4 - execstack -# - nodejs + - nodejs - npm stage-packages: - libfontconfig1 @@ -107,11 +106,6 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build - npm -g install n - n 12.14.1 - npm install -g node-gyp - npm install -g node-pre-gyp - npm install -g fibers #mkdir -p .build/python #cd .build/python #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python -- cgit v1.2.3-1-g7c22 From 634706ca6a7fb50beb8de8ac2c5ccaa64d07d12b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 20:44:46 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 022b49bf..8288f0b4 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -101,6 +101,7 @@ parts: - npm stage-packages: - libfontconfig1 + - libcurl3 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules -- cgit v1.2.3-1-g7c22 From 4d73eccaa8a9e0c3cfcdad5859c7a8919cba6d9c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 20:47:26 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 8288f0b4..298e5902 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -87,10 +87,11 @@ parts: node-packages: - node-gyp - node-pre-gyp - - fibers@2.0.0 + - fibers build-packages: - ca-certificates - apt-utils + - build-essential - python # - python3 - g++ -- cgit v1.2.3-1-g7c22 From 76c7fa67d8fc5fe916b7e003090fc2083d21d37f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 21:41:09 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 298e5902..dacb6895 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -93,7 +93,7 @@ parts: - apt-utils - build-essential - python -# - python3 + - python3 - g++ - capnproto - curl -- cgit v1.2.3-1-g7c22 From 7fc2f2e2e53f31bf5a1f3945f7c55a662648089c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 23:23:27 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index dacb6895..519744c6 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -92,7 +92,7 @@ parts: - ca-certificates - apt-utils - build-essential - - python +# - python - python3 - g++ - capnproto -- cgit v1.2.3-1-g7c22 From 8090b6f7014e66c1edb095d2d9f8e889db2f8387 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 23:29:23 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 519744c6..f3ed2f18 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -69,7 +69,9 @@ parts: #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.14.tgz #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump - stage-packages: [libssl1.0.0] + stage-packages: + - libssl1.0.0 + - libcurl3 filesets: mongo: - usr @@ -97,11 +99,13 @@ parts: - g++ - capnproto - curl + - libcurl3 - execstack - nodejs - npm stage-packages: - libfontconfig1 + - libssl1.0.0 - libcurl3 override-build: | echo "Cleaning environment first" -- cgit v1.2.3-1-g7c22 From fc6149d232cab8b9bd6184cb1d41cbd2df29e441 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 12 Jan 2020 15:47:01 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index f3ed2f18..16b68a02 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -112,6 +112,7 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build + mkdir -p stage/bin #mkdir -p .build/python #cd .build/python #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python -- cgit v1.2.3-1-g7c22 From cc020485c140565314b0bc492fb5c1b37ca01100 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 12 Jan 2020 22:37:37 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 16b68a02..2cb82168 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -112,7 +112,7 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build - mkdir -p stage/bin + mkdir -p $SNAPCRFT_PART_INSTALL/bin #mkdir -p .build/python #cd .build/python #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python -- cgit v1.2.3-1-g7c22 From 218b44d4762539ee7b42ce054aaa6ae841612525 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Jan 2020 11:16:43 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 94 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 93 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 2cb82168..6c5ef37b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -112,122 +112,30 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build - mkdir -p $SNAPCRFT_PART_INSTALL/bin - #mkdir -p .build/python - #cd .build/python - #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python - #cd esprima-python - #python3 setup.py install - #cd ../../.. - #mkdir -p ./public/api - #python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml - # we temporary need api2html and mkdirp - #npm install -g api2html@0.3.0 - #npm install -g mkdirp - #api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml - #npm uninstall -g mkdirp - #npm uninstall -g api2html - # Node Fibers 100% CPU usage issue: - # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161 - # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326 - # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129 - # Also see beginning of wekan/server/authentication.js - # import Fiber from "fibers"; - # Fiber.poolSize = 1e9; - # OLD: Download node version 8.12.0 prerelease build => Official node 8.12.0 has been released - # Description at https://releases.wekan.team/node.txt - ##echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348 node" >> node-SHASUMS256.txt.asc - ##curl https://releases.wekan.team/node -o node - # Verify Fibers patched node authenticity - ##echo "Fibers 100% CPU issue patched node authenticity:" - ##grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - - ##rm -f node-SHASUMS256.txt.asc - ##chmod +x node - ##mv node `which node` - # DOES NOT WORK: paxctl fix. - # Removed from build-packages: - paxctl - #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" - #paxctl -mC `which node` - #echo "Installing npm" - #curl -L https://www.npmjs.com/install.sh | sh echo "Installing meteor" curl https://install.meteor.com/ -o install_meteor.sh - #sed -i "s|RELEASE=.*|RELEASE=\"1.8.1-beta.0\"|g" install_meteor.sh chmod +x install_meteor.sh sh install_meteor.sh rm install_meteor.sh - # REPOS BELOW ARE INCLUDED TO WEKAN REPO - #if [ ! -d "packages" ]; then - # mkdir packages - #fi - #if [ ! -d "packages/kadira-flow-router" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router - # cd .. - #fi - #if [ ! -d "packages/meteor-useraccounts-core" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core - # sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js - # cd .. - #fi - #if [ ! -d "packages/meteor-accounts-cas" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas - # cd .. - #fi - #if [ ! -d "packages/wekan-ldap" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git - # cd .. - #fi - #if [ ! -d "packages/wekan-scrollbar" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git - # cd .. - #fi - #if [ ! -d "packages/wekan_accounts-oidc" ]; then - # cd packages - # git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git - # mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc - # mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc - # rm -rf meteor-accounts-oidc - # cd .. - #fi - #if [ ! -d "packages/markdown" ]; then - # cd packages - # git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git - # cd .. - #fi rm -rf .build 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 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 - #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c - #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt - #rm -rf node_modules/bcrypt - #meteor npm install --save bcrypt - # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. - #cd ../../../../ - # Change to directory .build/bundle/programs/server cd .build/bundle/programs/server npm install npm install --allow-superuser --save babel-runtime - #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ + mkdir -p $SNAPCRFT_PART_INSTALL/bin cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp - # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp organize: -- cgit v1.2.3-1-g7c22 From b591727b644e6434ecb32df344451f027b8bd681 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Jan 2020 11:17:23 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 6c5ef37b..71882b36 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -110,7 +110,6 @@ parts: override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules - # Create the OpenAPI specification rm -rf .build echo "Installing meteor" curl https://install.meteor.com/ -o install_meteor.sh -- cgit v1.2.3-1-g7c22 From 0009c4c65018a25bf180eb6b9af8e925ad88c795 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Jan 2020 12:29:05 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 71882b36..45a3bad4 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -128,7 +128,7 @@ parts: # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ - mkdir -p $SNAPCRFT_PART_INSTALL/bin + rm -rf $SNAPCRFT_PART_INSTALL/bin cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs -- cgit v1.2.3-1-g7c22 From 1159199e909ba2ae866bba091beb9f6f1bdecfe0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Jan 2020 19:43:25 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 45a3bad4..f64f8fa7 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -105,8 +105,6 @@ parts: - npm stage-packages: - libfontconfig1 - - libssl1.0.0 - - libcurl3 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules @@ -128,7 +126,6 @@ parts: # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ - rm -rf $SNAPCRFT_PART_INSTALL/bin cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs -- cgit v1.2.3-1-g7c22 From 116e63aa03ed4f0ed26bcf3cd73544b6c7f3ec7a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 14 Jan 2020 20:04:47 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index f64f8fa7..fb40d336 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -94,7 +94,7 @@ parts: - ca-certificates - apt-utils - build-essential -# - python + - python - python3 - g++ - capnproto -- cgit v1.2.3-1-g7c22 From feafa1827af03119c5cc9c53a87f03b5803ce33d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 16 Jan 2020 05:52:11 +0200 Subject: Try to fix Snap. --- snapcraft.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index fb40d336..a84c5d1f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,5 @@ name: wekan -version: 0 -version-script: git describe --tags | cut -c 2- +version: git summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -12,6 +11,7 @@ description: | confinement: strict grade: stable +base: core18 architectures: - amd64 @@ -69,9 +69,7 @@ parts: #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.14.tgz #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump - stage-packages: - - libssl1.0.0 - - libcurl3 + stage-packages: [libssl1.0.0, libcurl3] filesets: mongo: - usr -- cgit v1.2.3-1-g7c22 From 55a2aa90cbbf44200e9b0b9f4bd08b6177f1bb95 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 16 Jan 2020 06:07:22 +0200 Subject: Use Meteor 1.8.x on Snap. --- snapcraft.yaml | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 106 insertions(+), 11 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index a84c5d1f..b17c714d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,6 @@ name: wekan -version: git +version: 0 +version-script: git describe --tags | cut -c 2- summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -11,7 +12,6 @@ description: | confinement: strict grade: stable -base: core18 architectures: - amd64 @@ -65,11 +65,9 @@ apps: parts: mongodb: - source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.2/multiverse/binary-amd64/mongodb-org-server_4.2.2_amd64.deb - #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.14.tgz - #https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump - stage-packages: [libssl1.0.0, libcurl3] + stage-packages: [libssl1.0.0] filesets: mongo: - usr @@ -83,21 +81,19 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.14.1 + node-engine: 8.17.0 node-packages: - node-gyp - node-pre-gyp - - fibers + - fibers@2.0.0 build-packages: - ca-certificates - apt-utils - - build-essential - python - - python3 +# - python3 - g++ - capnproto - curl - - libcurl3 - execstack - nodejs - npm @@ -106,21 +102,119 @@ parts: override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules + # Create the OpenAPI specification rm -rf .build + # Use Meteor 1.8.x on Snap + rm -rf .meteor + mv .snap-meteor-1.8/.meteor . + mv .snap-meteor-1.8/package.json . + mv .snap-meteor-1.8/package-lock.json . + rm -rf .snap-meteor-1.8 + #mkdir -p .build/python + #cd .build/python + #git clone --depth 1 -b master https://github.com/Kronuz/esprima-python + #cd esprima-python + #python3 setup.py install + #cd ../../.. + #mkdir -p ./public/api + #python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml + # we temporary need api2html and mkdirp + #npm install -g api2html@0.3.0 + #npm install -g mkdirp + #api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml + #npm uninstall -g mkdirp + #npm uninstall -g api2html + # Node Fibers 100% CPU usage issue: + # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161 + # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326 + # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129 + # Also see beginning of wekan/server/authentication.js + # import Fiber from "fibers"; + # Fiber.poolSize = 1e9; + # OLD: Download node version 8.12.0 prerelease build => Official node 8.12.0 has been released + # Description at https://releases.wekan.team/node.txt + ##echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348 node" >> node-SHASUMS256.txt.asc + ##curl https://releases.wekan.team/node -o node + # Verify Fibers patched node authenticity + ##echo "Fibers 100% CPU issue patched node authenticity:" + ##grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - + ##rm -f node-SHASUMS256.txt.asc + ##chmod +x node + ##mv node `which node` + # DOES NOT WORK: paxctl fix. + # Removed from build-packages: - paxctl + #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" + #paxctl -mC `which node` + #echo "Installing npm" + #curl -L https://www.npmjs.com/install.sh | sh echo "Installing meteor" curl https://install.meteor.com/ -o install_meteor.sh + #sed -i "s|RELEASE=.*|RELEASE=\"1.8.1-beta.0\"|g" install_meteor.sh chmod +x install_meteor.sh sh install_meteor.sh rm install_meteor.sh + # REPOS BELOW ARE INCLUDED TO WEKAN REPO + #if [ ! -d "packages" ]; then + # mkdir packages + #fi + #if [ ! -d "packages/kadira-flow-router" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router + # cd .. + #fi + #if [ ! -d "packages/meteor-useraccounts-core" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core + # sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js + # cd .. + #fi + #if [ ! -d "packages/meteor-accounts-cas" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas + # cd .. + #fi + #if [ ! -d "packages/wekan-ldap" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + # cd .. + #fi + #if [ ! -d "packages/wekan-scrollbar" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git + # cd .. + #fi + #if [ ! -d "packages/wekan_accounts-oidc" ]; then + # cd packages + # git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git + # mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc + # mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc + # rm -rf meteor-accounts-oidc + # cd .. + #fi + #if [ ! -d "packages/markdown" ]; then + # cd packages + # git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git + # cd .. + #fi rm -rf .build 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 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 + #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c + #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt + #rm -rf node_modules/bcrypt + #meteor npm install --save bcrypt + # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. + #cd ../../../../ + # Change to directory .build/bundle/programs/server cd .build/bundle/programs/server npm install npm install --allow-superuser --save babel-runtime + #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ @@ -130,6 +224,7 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp + # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp organize: -- cgit v1.2.3-1-g7c22 From 6a01170d8696322462c4065ce0cf4a637a058975 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 16 Jan 2020 06:15:10 +0200 Subject: Use Meteor 1.8.x on Snap. --- snapcraft.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index b17c714d..c43418bb 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -109,6 +109,12 @@ parts: mv .snap-meteor-1.8/.meteor . mv .snap-meteor-1.8/package.json . mv .snap-meteor-1.8/package-lock.json . + # Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those + mv .snap-meteor-1.8/cfs_access-point.txt fix-download-unicode/ + mv .snap-meteor-1.8/export.js models/ + mv .snap-meteor-1.8/wekanCreator.js models/ + mv .snap-meteor-1.8/ldap.js packages/wekan-ldap/server/ldap.js + mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js rm -rf .snap-meteor-1.8 #mkdir -p .build/python #cd .build/python -- cgit v1.2.3-1-g7c22 From 8384d68a060ef8f2c202ce2fa6064c5c823d28dc Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 7 Feb 2020 03:12:27 +0200 Subject: Use Meteor 1.9 and Node.js 12.15.0 on Snap and Docker. Thanks to xet7 ! --- snapcraft.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index c43418bb..254c84f7 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,11 +81,11 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.17.0 + node-engine: 12.15.0 node-packages: - node-gyp - node-pre-gyp - - fibers@2.0.0 + - fibers build-packages: - ca-certificates - apt-utils @@ -104,17 +104,17 @@ parts: rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules # Create the OpenAPI specification rm -rf .build - # Use Meteor 1.8.x on Snap - rm -rf .meteor - mv .snap-meteor-1.8/.meteor . - mv .snap-meteor-1.8/package.json . - mv .snap-meteor-1.8/package-lock.json . - # Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those - mv .snap-meteor-1.8/cfs_access-point.txt fix-download-unicode/ - mv .snap-meteor-1.8/export.js models/ - mv .snap-meteor-1.8/wekanCreator.js models/ - mv .snap-meteor-1.8/ldap.js packages/wekan-ldap/server/ldap.js - mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js + ## Use Meteor 1.8.x on Snap + #rm -rf .meteor + #mv .snap-meteor-1.8/.meteor . + #mv .snap-meteor-1.8/package.json . + #mv .snap-meteor-1.8/package-lock.json . + ## Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those + #mv .snap-meteor-1.8/cfs_access-point.txt fix-download-unicode/ + #mv .snap-meteor-1.8/export.js models/ + #mv .snap-meteor-1.8/wekanCreator.js models/ + #mv .snap-meteor-1.8/ldap.js packages/wekan-ldap/server/ldap.js + #mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js rm -rf .snap-meteor-1.8 #mkdir -p .build/python #cd .build/python -- cgit v1.2.3-1-g7c22 From cbbb5deff7d84a91c40becc9caaf70f5b6738b63 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 20 Feb 2020 20:46:25 +0200 Subject: Update to Meteor 1.9.1, Node 12.16.1 etc newest dependencies. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 254c84f7..2b6b1ef9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.15.0 + node-engine: 12.16.1 node-packages: - node-gyp - node-pre-gyp -- cgit v1.2.3-1-g7c22 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 ! --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') 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 From 88573ad2cdb8596b795a82ef40a0662180e8a7d7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 1 Mar 2020 22:07:55 +0200 Subject: Try to revert remaining of the following changes: - Revert change made at Wekan v3.81, because building did not work: [Try to make Meteor build time shorter by excluding legacy and cordova. This was made possible by Meteor 1.10-rc.2](https://github.com/wekan/wekan/commit/0d3002f69d97e646fa7368bfdade4f78c51e9884). Thanks to xet7. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index f59e3200..2b6b1ef9 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 --exclude-archs web.browser.legacy,web.cordova + meteor build .build --directory --allow-superuser 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 From 6db717b9b384fe1491063e507b80e67791a07e3a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 9 Apr 2020 22:47:11 +0300 Subject: Upgrade to Node v12.16.2 Thanks to Node developers and xet7 ! --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 2b6b1ef9..940bb378 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.16.1 + node-engine: 12.16.2 node-packages: - node-gyp - node-pre-gyp -- cgit v1.2.3-1-g7c22 From 6b808dd74bf6d12d6a7ee7c23dfa3943b229a51d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 22 Apr 2020 21:48:46 +0300 Subject: Try to upgrade MongoDB version in Snap. Thanks to xet7 ! --- snapcraft.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 940bb378..6b9cb077 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,9 +65,9 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.6.tgz plugin: dump - stage-packages: [libssl1.0.0] + stage-packages: [libssl1.0.0, libcurl3] filesets: mongo: - usr @@ -90,10 +90,11 @@ parts: - ca-certificates - apt-utils - python -# - python3 + - python3 - g++ - capnproto - curl + - libcurl3 - execstack - nodejs - npm -- cgit v1.2.3-1-g7c22 From 4550e10fbeead146b5742820bd53b6846772c5f6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 22 Apr 2020 22:43:20 +0300 Subject: Revert Snap MongoDB changes. Thanks to xet7 ! --- snapcraft.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 6b9cb077..940bb378 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,9 +65,9 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.6.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump - stage-packages: [libssl1.0.0, libcurl3] + stage-packages: [libssl1.0.0] filesets: mongo: - usr @@ -90,11 +90,10 @@ parts: - ca-certificates - apt-utils - python - - python3 +# - python3 - g++ - capnproto - curl - - libcurl3 - execstack - nodejs - npm -- cgit v1.2.3-1-g7c22 From 1235363465b824d26129d4aa74a4445f362c1a73 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 25 Apr 2020 03:47:44 +0300 Subject: Fix Wekan not load at all in Firefox v.68 for Android. Thanks to xet7 ! Closes #3021 --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 940bb378..689d150c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -216,6 +216,8 @@ parts: #meteor npm install --save bcrypt # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. #cd ../../../../ + # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc. + rm -rf .build/bundle/programs/web.browser.legacy # Change to directory .build/bundle/programs/server cd .build/bundle/programs/server npm install -- cgit v1.2.3-1-g7c22 From 1d89e96dd101c11913f1acdd6d16b5650eaf18a7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 28 Apr 2020 18:58:01 +0300 Subject: Upgrade to Node v12.16.3 Thanks to Node developers and xet7 ! --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 689d150c..378a2202 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.16.2 + node-engine: 12.16.3 node-packages: - node-gyp - node-pre-gyp -- cgit v1.2.3-1-g7c22