2
0
Эх сурвалжийг харах

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

Thanks to xet7 !
Lauri Ojansivu 5 жил өмнө
parent
commit
8384d68a06

+ 2 - 2
.meteor/versions

@@ -110,7 +110,7 @@ modern-browsers@0.1.5
 modules@0.15.0
 modules-runtime@0.12.0
 momentjs:moment@2.24.0
-mongo@1.8.0
+mongo@1.8.1
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
@@ -162,7 +162,7 @@ simple:json-routes@2.1.0
 simple:rest-accounts-password@1.1.2
 simple:rest-bearer-token-parser@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
 spacebars@1.0.15
 spacebars-compiler@1.1.3

+ 2 - 2
.travis.yml

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

+ 1 - 1
Dockerfile

@@ -6,7 +6,7 @@ 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=v12.14.1 \
+    NODE_VERSION=v12.15.0 \
     METEOR_RELEASE=1.9.0 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

+ 2 - 2
rebuild-wekan.bat

@@ -18,8 +18,8 @@ REM Install chocolatey
 
 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
-call node-v12.14.1-x64.msi
+curl -O https://nodejs.org/dist/v8.17.0/node-v12.15.0-x64.msi
+call node-v12.15.0-x64.msi
 
 call npm config -g set msvs_version 2015
 call meteor npm config -g set msvs_version 2015

+ 2 - 2
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.14.1
+#NODE_VERSION=12.15.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.14.1
+			sudo n 12.15.0
 			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
 			#sudo apt-get install -y nodejs
 		elif [[ "$OSTYPE" == "darwin"* ]]; then

+ 13 - 13
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

+ 1 - 1
stacksmith/user-scripts/build.sh

@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 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
 USE_EDGE=false
 METEOR_EDGE=1.5-beta.17

+ 1 - 1
torodb-postgresql/docker-compose.yml

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