Use Meteor 1.9 and Node.js 12.15.0 on Snap and Docker.

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2020-02-07 03:12:27 +02:00
parent 120a430deb
commit 8384d68a06
8 changed files with 24 additions and 24 deletions

View file

@ -110,7 +110,7 @@ modern-browsers@0.1.5
modules@0.15.0 modules@0.15.0
modules-runtime@0.12.0 modules-runtime@0.12.0
momentjs:moment@2.24.0 momentjs:moment@2.24.0
mongo@1.8.0 mongo@1.8.1
mongo-decimal@0.1.1 mongo-decimal@0.1.1
mongo-dev-server@1.1.0 mongo-dev-server@1.1.0
mongo-id@1.0.7 mongo-id@1.0.7
@ -162,7 +162,7 @@ simple:json-routes@2.1.0
simple:rest-accounts-password@1.1.2 simple:rest-accounts-password@1.1.2
simple:rest-bearer-token-parser@1.0.1 simple:rest-bearer-token-parser@1.0.1
simple:rest-json-error-handler@1.0.1 simple:rest-json-error-handler@1.0.1
socket-stream-client@0.2.2 socket-stream-client@0.2.3
softwarerero:accounts-t9n@1.3.11 softwarerero:accounts-t9n@1.3.11
spacebars@1.0.15 spacebars@1.0.15
spacebars-compiler@1.1.3 spacebars-compiler@1.1.3

View file

@ -1,9 +1,9 @@
dist: disco dist: eoan
sudo: required sudo: required
env: env:
TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0 TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
TRAVIS_NODE_VERSION: 12.14.1 TRAVIS_NODE_VERSION: 12.15.0
TRAVIS_NPM_VERSION: latest TRAVIS_NPM_VERSION: latest
before_install: before_install:

View file

@ -6,7 +6,7 @@ LABEL maintainer="wekan"
# ENV BUILD_DEPS="paxctl" # ENV BUILD_DEPS="paxctl"
ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
DEBUG=false \ DEBUG=false \
NODE_VERSION=v12.14.1 \ NODE_VERSION=v12.15.0 \
METEOR_RELEASE=1.9.0 \ METEOR_RELEASE=1.9.0 \
USE_EDGE=false \ USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \ METEOR_EDGE=1.5-beta.17 \

View file

@ -18,8 +18,8 @@ REM Install chocolatey
choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
curl -O https://nodejs.org/dist/v8.17.0/node-v12.14.1-x64.msi curl -O https://nodejs.org/dist/v8.17.0/node-v12.15.0-x64.msi
call node-v12.14.1-x64.msi call node-v12.15.0-x64.msi
call npm config -g set msvs_version 2015 call npm config -g set msvs_version 2015
call meteor npm config -g set msvs_version 2015 call meteor npm config -g set msvs_version 2015

View file

@ -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." echo " You can still use any other locale as your main locale."
#Below script installs newest node 8.x for Debian/Ubuntu/Mint. #Below script installs newest node 8.x for Debian/Ubuntu/Mint.
#NODE_VERSION=12.14.1 #NODE_VERSION=12.15.0
#X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"
function pause(){ function pause(){
@ -79,7 +79,7 @@ do
curl -0 -L https://npmjs.org/install.sh | sudo sh curl -0 -L https://npmjs.org/install.sh | sudo sh
sudo chown -R $(id -u):$(id -g) $HOME/.npm sudo chown -R $(id -u):$(id -g) $HOME/.npm
sudo npm -g install n sudo npm -g install n
sudo n 12.14.1 sudo n 12.15.0
#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - #curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
#sudo apt-get install -y nodejs #sudo apt-get install -y nodejs
elif [[ "$OSTYPE" == "darwin"* ]]; then elif [[ "$OSTYPE" == "darwin"* ]]; then

View file

@ -81,11 +81,11 @@ parts:
wekan: wekan:
source: . source: .
plugin: nodejs plugin: nodejs
node-engine: 8.17.0 node-engine: 12.15.0
node-packages: node-packages:
- node-gyp - node-gyp
- node-pre-gyp - node-pre-gyp
- fibers@2.0.0 - fibers
build-packages: build-packages:
- ca-certificates - ca-certificates
- apt-utils - apt-utils
@ -104,17 +104,17 @@ parts:
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
# Create the OpenAPI specification # Create the OpenAPI specification
rm -rf .build rm -rf .build
# Use Meteor 1.8.x on Snap ## Use Meteor 1.8.x on Snap
rm -rf .meteor #rm -rf .meteor
mv .snap-meteor-1.8/.meteor . #mv .snap-meteor-1.8/.meteor .
mv .snap-meteor-1.8/package.json . #mv .snap-meteor-1.8/package.json .
mv .snap-meteor-1.8/package-lock.json . #mv .snap-meteor-1.8/package-lock.json .
# Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those ## 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/cfs_access-point.txt fix-download-unicode/
mv .snap-meteor-1.8/export.js models/ #mv .snap-meteor-1.8/export.js models/
mv .snap-meteor-1.8/wekanCreator.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/ldap.js packages/wekan-ldap/server/ldap.js
mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js #mv .snap-meteor-1.8/oidc_server.js packages/wekan-oidc/oidc_server.js
rm -rf .snap-meteor-1.8 rm -rf .snap-meteor-1.8
#mkdir -p .build/python #mkdir -p .build/python
#cd .build/python #cd .build/python

View file

@ -2,7 +2,7 @@
set -euxo pipefail set -euxo pipefail
BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
NODE_VERSION=v12.13.0 NODE_VERSION=v12.15.0
#METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer #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 USE_EDGE=false
METEOR_EDGE=1.5-beta.17 METEOR_EDGE=1.5-beta.17

View file

@ -132,7 +132,7 @@ services:
' 1>/dev/null 2>&1 & ' 1>/dev/null 2>&1 &
mongod --replSet rs1 mongod --replSet rs1
wekan: wekan:
image: wekanteam/wekan:latestdevel image: quay.io/wekan/wekan
container_name: wekan-app container_name: wekan-app
restart: always restart: always
networks: networks: