diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 8 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 4 | ||||
| -rw-r--r-- | .meteor/packages | 8 | ||||
| -rw-r--r-- | .meteor/release | 2 | ||||
| -rw-r--r-- | .meteor/versions | 34 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Dockerfile | 22 | ||||
| -rw-r--r-- | docker-compose.yml | 26 | ||||
| -rw-r--r-- | rebuild-wekan.bat | 6 | ||||
| -rwxr-xr-x | rebuild-wekan.sh | 8 | ||||
| -rwxr-xr-x | releases/sandstorm-make-spk.sh | 2 | ||||
| -rwxr-xr-x | releases/snap-install.sh | 2 | ||||
| -rwxr-xr-x | snap-src/bin/mongodb-control | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 5 | ||||
| -rwxr-xr-x | stacksmith/user-scripts/build.sh | 7 |
16 files changed, 72 insertions, 84 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ec607118..c2be3595 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:rolling +FROM ubuntu:disco LABEL maintainer="sgr" ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2" @@ -6,10 +6,10 @@ ENV DEBIAN_FRONTEND=noninteractive ENV \ DEBUG=false \ - NODE_VERSION=12.13.1 \ - METEOR_RELEASE=1.9-beta.4 \ + NODE_VERSION=8.16.2 \ + METEOR_RELEASE=1.8.1 \ USE_EDGE=false \ - METEOR_EDGE=1.9-beta.4 \ + METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ FIBERS_VERSION=4.0.1 \ ARCHITECTURE=linux-x64 \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index fc6ee3ff..fab77056 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -3,10 +3,10 @@ version: '3.7' services: wekandb-dev: - image: mongo:4.2.1 + image: mongo:4.0.12 container_name: wekan-dev-db restart: unless-stopped - command: mongod --oplogSize 128 + command: mongod --smallfiles --oplogSize 128 networks: - wekan-dev-tier expose: diff --git a/.meteor/packages b/.meteor/packages index 2c21b34c..7fa85bee 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -6,9 +6,9 @@ meteor-base@1.4.0 # Build system -ecmascript@0.14.0-beta190.4 -standard-minifier-css@1.6.0-beta190.4 -standard-minifier-js@2.6.0-beta190.4 +ecmascript@0.13.0 +standard-minifier-css@1.5.4 +standard-minifier-js@2.5.0 mquandalle:jade # Polyfills @@ -22,7 +22,7 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.8.0-beta190.4 +mongo@1.7.0 mquandalle:collection-mutations # Account system diff --git a/.meteor/release b/.meteor/release index 52d4304f..250a263b 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.9-beta.4 +METEOR@1.8.2 diff --git a/.meteor/versions b/.meteor/versions index 0d3c9281..2b21c42e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,7 +1,7 @@ 3stack:presence@1.1.2 -accounts-base@1.5.0-beta190.4 +accounts-base@1.4.5 accounts-oauth@1.1.16 -accounts-password@1.5.2 +accounts-password@1.5.1 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 @@ -12,8 +12,8 @@ allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 autoupdate@1.6.0 -babel-compiler@7.5.0-beta190.4 -babel-runtime@1.5.0-beta190.4 +babel-compiler@7.4.0 +babel-runtime@1.4.0 base64@1.0.12 binary-heap@1.0.11 blaze@2.3.3 @@ -23,7 +23,7 @@ browser-policy-common@1.0.11 browser-policy-framing@1.1.0 caching-compiler@1.2.1 caching-html-compiler@1.1.3 -callback-hook@1.3.0-beta190.4 +callback-hook@1.2.0 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -57,10 +57,10 @@ deps@1.0.12 diff-sequence@1.1.1 dynamic-import@0.5.1 easylogic:summernote@0.8.8 -ecmascript@0.14.0-beta190.4 +ecmascript@0.13.0 ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.10.0-beta190.4 -ecmascript-runtime-server@0.9.0-beta190.4 +ecmascript-runtime-client@0.9.0 +ecmascript-runtime-server@0.8.0 ejson@1.1.0 email@1.2.3 es5-shim@4.8.0 @@ -101,16 +101,16 @@ meteorhacks:collection-utils@1.2.0 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 meteorspark:util@0.2.0 -minifier-css@1.5.0-beta190.4 -minifier-js@2.6.0-beta190.4 +minifier-css@1.4.3 +minifier-js@2.5.0 minifiers@1.1.8-faster-rebuild.0 minimongo@1.4.5 mobile-status-bar@1.0.14 modern-browsers@0.1.4 -modules@0.15.0-beta190.4 -modules-runtime@0.12.0-beta190.4 +modules@0.14.0 +modules-runtime@0.11.0 momentjs:moment@2.24.0 -mongo@1.8.0-beta190.4 +mongo@1.7.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 @@ -127,7 +127,7 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.8.0 npm-bcrypt@0.9.3 -npm-mongo@3.3.0-beta190.4 +npm-mongo@3.2.0 oauth@1.2.8 oauth2@1.2.1 observe-sequence@1.0.16 @@ -167,8 +167,8 @@ softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 srp@1.0.12 -standard-minifier-css@1.6.0-beta190.4 -standard-minifier-js@2.6.0-beta190.4 +standard-minifier-css@1.5.4 +standard-minifier-js@2.5.0 staringatlights:fast-render@3.2.0 staringatlights:inject-data@2.3.0 tap:i18n@1.8.2 @@ -186,7 +186,7 @@ useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.8.0-beta190.4 +webapp@1.7.5 webapp-hashing@1.0.9 wekan-accounts-cas@0.1.0 wekan-accounts-oidc@1.0.10 diff --git a/.travis.yml b/.travis.yml index a015cb24..6f0a9e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ -dist: rolling +dist: disco sudo: required env: TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0 - TRAVIS_NODE_VERSION: 12.13.1 + TRAVIS_NODE_VERSION: 8.16.2 TRAVIS_NPM_VERSION: latest before_install: @@ -14,7 +14,7 @@ before_install: - sudo curl -L https://github.com/docker/compose/releases/download/${TRAVIS_DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - sudo chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - - travis_wait 60 sudo docker-compose build --no-cache --force-rm + - sudo docker-compose build --no-cache --force-rm - sudo docker-compose up -d wekandb - sudo docker-compose up -d wekan # ^^ Note - need to come up with some way of checking the output from docker run diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3ad4f5..b34b69ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,3 @@ -# Upcoming Wekan release - -This release adds the following updates: - -- [Update to Meteor 1.9-beta.4, Node.js 12.13.1 and MongoDB 4.2.1. - Remove MongoDB option --smallfiles that is not supported in MongoDB 4.2.1. - Add MongoDB option --quiet to docker-compose.yml. - Update snap fibers to 4.0.1](https://github.com/wekan/wekan/commit/467a3be8509d4a45cd26da7f199b4dbd049086fd). - Thanks to xet7. - -Thanks to above GitHub users for their contributions and translators for their translations. - # v3.56 2019-11-21 Wekan release This release adds the following updates: @@ -6,10 +6,10 @@ LABEL maintainer="wekan" # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ DEBUG=false \ - NODE_VERSION=12.13.1 \ - METEOR_RELEASE=1.9-beta.4 \ + NODE_VERSION=v8.16.2 \ + METEOR_RELEASE=1.8.1 \ USE_EDGE=false \ - METEOR_EDGE=1.9-beta.4 \ + METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ FIBERS_VERSION=4.0.1 \ ARCHITECTURE=linux-x64 \ @@ -130,8 +130,8 @@ RUN \ ln -sf $(which bsdtar) $(which tar) && \ \ # Download nodejs - wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - wget https://nodejs.org/dist/v${NODE_VERSION}/SHASUMS256.txt.asc && \ + wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \ #--------------------------------------------------------------------------------------------- # Node Fibers 100% CPU usage issue: # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161 @@ -146,7 +146,7 @@ RUN \ #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795 node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ \ # Verify nodejs authenticity - grep v${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ + grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ #export GNUPGHOME="$(mktemp -d)" && \ #\ # Try other key servers if ha.pool.sks-keyservers.net is unreachable @@ -173,12 +173,12 @@ RUN \ rm -f SHASUMS256.txt.asc && \ \ # Install Node - tar xvzf node-v${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - rm node-v${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - mv node-v${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ + tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ - mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/${NODE_VERSION} /home/wekan/.config && \ + mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.1 /home/wekan/.config && \ chown wekan --recursive /home/wekan/.config && \ \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 @@ -275,7 +275,7 @@ RUN \ # Cleanup apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ - #npm uninstall -g api2html &&\ + npm uninstall -g api2html &&\ rm -R /var/lib/apt/lists/* && \ rm -R /home/wekan/.meteor && \ rm -R /home/wekan/app && \ diff --git a/docker-compose.yml b/docker-compose.yml index 29c930c5..a0e641c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,14 +93,14 @@ services: #------------------------------------------------------------------------------------- # ==== MONGODB AND METEOR VERSION ==== # a) For Wekan Meteor 1.8.x version at master branch, use mongo 4.x - image: mongo:4.2.1 + image: mongo:4.0.12 # b) For Wekan Meteor 1.6.x version at devel branch. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x #image: mongo:3.2.21 #------------------------------------------------------------------------------------- container_name: wekan-db restart: always - command: mongod --oplogSize 128 --quiet + command: mongod --smallfiles --oplogSize 128 networks: - wekan-tier expose: @@ -129,17 +129,17 @@ services: #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== # ==== and use commands: docker-compose up -d --build - build: - context: . - dockerfile: Dockerfile - args: - - NODE_VERSION=${NODE_VERSION} - - METEOR_RELEASE=${METEOR_RELEASE} - - NPM_VERSION=${NPM_VERSION} - - ARCHITECTURE=${ARCHITECTURE} - - SRC_PATH=${SRC_PATH} - - METEOR_EDGE=${METEOR_EDGE} - - USE_EDGE=${USE_EDGE} + #build: + # context: . + # dockerfile: Dockerfile + # args: + # - NODE_VERSION=${NODE_VERSION} + # - METEOR_RELEASE=${METEOR_RELEASE} + # - NPM_VERSION=${NPM_VERSION} + # - ARCHITECTURE=${ARCHITECTURE} + # - SRC_PATH=${SRC_PATH} + # - METEOR_EDGE=${METEOR_EDGE} + # - USE_EDGE=${USE_EDGE} #------------------------------------------------------------------------------------- ports: # Docker outsideport:insideport. Do not add anything extra here. diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 1241b68a..346a4aec 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -11,10 +11,10 @@ cd C:\repos REM Install chocolatey
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-choco install -y git curl python2 dotnet4.5.2 nano mongodb-4 mongoclient meteor
+choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
-curl -O https://nodejs.org/dist/v8.16.2/node-v12.13.1-x64.msi
-call node-v12.13.1-x64.msi
+curl -O https://nodejs.org/dist/v8.16.2/node-v8.16.2-x64.msi
+call node-v8.16.2-x64.msi
call npm config -g set msvs_version 2015
call meteor npm config -g set msvs_version 2015
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index b45810fb..8381e170 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -5,7 +5,7 @@ echo " with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct echo " You can still use any other locale as your main locale." #Below script installs newest node 8.x for Debian/Ubuntu/Mint. -#NODE_VERSION=12.13.1 +#NODE_VERSION=8.16.0 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" function pause(){ @@ -79,7 +79,7 @@ do curl -0 -L https://npmjs.org/install.sh | sudo sh sudo chown -R $(id -u):$(id -g) $HOME/.npm sudo npm -g install n - sudo n 12.13.1 + sudo n 8.16.2 #curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - #sudo apt-get install -y nodejs elif [[ "$OSTYPE" == "darwin"* ]]; then @@ -106,10 +106,10 @@ do exit; fi - ## Latest npm with Meteor 1.9.x + ## Latest npm with Meteor 1.8.x npm_call -g install npm npm_call -g install node-gyp - # Latest fibers for Meteor 1.9.x + # Latest fibers for Meteor 1.8.x sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp npm_call -g install fibers@4.0.1 # Install Meteor, if it's not yet installed diff --git a/releases/sandstorm-make-spk.sh b/releases/sandstorm-make-spk.sh index ade97666..8db2a4c3 100755 --- a/releases/sandstorm-make-spk.sh +++ b/releases/sandstorm-make-spk.sh @@ -1 +1 @@ -meteor-spk pack wekan-$1.spk +meteor-spk pack wekan-1.11.spk diff --git a/releases/snap-install.sh b/releases/snap-install.sh index 0021a81e..bdb0b7a2 100755 --- a/releases/snap-install.sh +++ b/releases/snap-install.sh @@ -1 +1 @@ -sudo snap install --dangerous wekan_$1.snap +sudo snap install --dangerous wekan_1.23-17-g9c94ea5_amd64.snap diff --git a/snap-src/bin/mongodb-control b/snap-src/bin/mongodb-control index 27420035..a79785b0 100755 --- a/snap-src/bin/mongodb-control +++ b/snap-src/bin/mongodb-control @@ -52,14 +52,14 @@ if [ -z "$MONGO_URL" ]; then ## OLD: Logging to file. #mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles ## NEW: Logging to syslog, that usually has already log rotation. - mongod --dbpath $SNAP_COMMON --syslog --journal $BIND_OPTIONS --quiet + mongod --dbpath $SNAP_COMMON --syslog --journal $BIND_OPTIONS --smallfiles --quiet else ## OLD: Logging to file. #mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $MONGO_URL --smallfiles ## NEW: Logging to syslog, that usually has already log rotation. - mongod --dbpath $SNAP_COMMON --syslog --journal $MONGO_URL --quiet + mongod --dbpath $SNAP_COMMON --syslog --journal $MONGO_URL --smallfiles --quiet fi diff --git a/snapcraft.yaml b/snapcraft.yaml index 426543b8..41f1585c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,11 +81,11 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.13.1 + node-engine: 8.16.2 node-packages: - node-gyp - node-pre-gyp - - fibers@4.0.1 + - fibers@2.0.0 build-packages: - ca-certificates - apt-utils @@ -99,7 +99,6 @@ parts: - npm stage-packages: - libfontconfig1 -# - libcurl3 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index fd468106..23dc7f84 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,13 +2,14 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v12.13.1 -#METEOR_RELEASE=1.9-beta.4 - for Stacksmith +NODE_VERSION=v8.16.2 +#METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false -METEOR_EDGE=1.9-beta.4 +METEOR_EDGE=1.5-beta.17 NPM_VERSION=latest FIBERS_VERSION=4.0.1 ARCHITECTURE=linux-x64 +#NODE_VERSION=v10.14.1 sudo yum groupinstall -y 'Development Tools' sudo yum install -y http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm |