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

- Back to Meteor 1.6.0.1 and MongoDB 3.2.21 to make Snap work.

Thanks to xet7 !
Lauri Ojansivu 6 жил өмнө
parent
commit
20af78e50b

+ 0 - 1
.meteor/.finished-upgraders

@@ -16,4 +16,3 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
 1.5-add-dynamic-import-package
-1.7-split-underscore-from-meteor-base

+ 16 - 17
.meteor/packages

@@ -3,18 +3,17 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 # but you can also edit it by hand.
 
 
-meteor-base@1.4.0
+meteor-base@1.2.0
 
 
 # Build system
 # Build system
-ecmascript@0.12.0
+ecmascript
 stylus@2.513.13
 stylus@2.513.13
-standard-minifier-css@1.5.0
-standard-minifier-js@2.4.0
+standard-minifier-css@1.3.5
+standard-minifier-js@2.2.0
 mquandalle:jade
 mquandalle:jade
-coffeescript@2.3.1_2!
 
 
 # Polyfills
 # Polyfills
-es5-shim@4.8.0
+es5-shim@4.6.15
 
 
 # Collections
 # Collections
 aldeed:collection2
 aldeed:collection2
@@ -24,7 +23,7 @@ dburles:collection-helpers
 idmontie:migrations
 idmontie:migrations
 matb33:collection-hooks
 matb33:collection-hooks
 matteodem:easy-search
 matteodem:easy-search
-mongo@1.6.0
+mongo@1.3.1
 mquandalle:collection-mutations
 mquandalle:collection-mutations
 
 
 # Account system
 # Account system
@@ -35,12 +34,12 @@ useraccounts:flow-routing
 salleman:accounts-oidc
 salleman:accounts-oidc
 
 
 # Utilities
 # Utilities
-check@1.3.1
+check@1.2.5
 jquery@1.11.10
 jquery@1.11.10
-random@1.1.0
-reactive-dict@1.2.1
-session@1.1.8
-tracker@1.2.0
+random@1.0.10
+reactive-dict@1.2.0
+session@1.1.7
+tracker@1.1.3
 underscore@1.0.10
 underscore@1.0.10
 3stack:presence
 3stack:presence
 alethes:pages
 alethes:pages
@@ -54,7 +53,7 @@ mquandalle:autofocus
 ongoworks:speakingurl
 ongoworks:speakingurl
 raix:handlebar-helpers
 raix:handlebar-helpers
 tap:i18n
 tap:i18n
-http@1.4.1
+http@1.3.0
 
 
 # UI components
 # UI components
 blaze
 blaze
@@ -71,21 +70,21 @@ templates:tabs
 verron:autosize
 verron:autosize
 simple:json-routes
 simple:json-routes
 rajit:bootstrap3-datepicker
 rajit:bootstrap3-datepicker
-shell-server@0.4.0
+shell-server@0.3.0
 simple:rest-accounts-password
 simple:rest-accounts-password
 useraccounts:core
 useraccounts:core
 email@1.2.3
 email@1.2.3
 horka:swipebox
 horka:swipebox
-dynamic-import@0.5.0
+dynamic-import@0.2.0
 staringatlights:fast-render
 staringatlights:fast-render
 
 
 mixmax:smart-disconnect
 mixmax:smart-disconnect
-accounts-password@1.5.1
+accounts-password@1.5.0
 cfs:gridfs
 cfs:gridfs
 eluck:accounts-lockout
 eluck:accounts-lockout
 rzymek:fullcalendar
 rzymek:fullcalendar
 momentjs:moment@2.22.2
 momentjs:moment@2.22.2
-browser-policy-framing@1.1.0
+browser-policy-framing
 mquandalle:moment
 mquandalle:moment
 msavin:usercache
 msavin:usercache
 wekan:wekan-ldap
 wekan:wekan-ldap

+ 1 - 1
.meteor/release

@@ -1 +1 @@
-METEOR@1.8.1-beta.0
+METEOR@1.6.0.1

+ 57 - 62
.meteor/versions

@@ -1,7 +1,7 @@
 3stack:presence@1.1.2
 3stack:presence@1.1.2
-accounts-base@1.4.3
-accounts-oauth@1.1.16
-accounts-password@1.5.1
+accounts-base@1.4.0
+accounts-oauth@1.1.15
+accounts-password@1.5.0
 aldeed:collection2@2.10.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
 aldeed:schema-deny@1.1.0
@@ -11,19 +11,19 @@ alethes:pages@1.8.6
 allow-deny@1.1.0
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 audit-argument-checks@1.0.7
-autoupdate@1.5.0
-babel-compiler@7.2.0
-babel-runtime@1.3.0
-base64@1.0.11
-binary-heap@1.0.11
-blaze@2.3.3
+autoupdate@1.3.12
+babel-compiler@6.24.7
+babel-runtime@1.1.1
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.3.2
 blaze-tools@1.0.10
 blaze-tools@1.0.10
-boilerplate-generator@1.6.0
+boilerplate-generator@1.3.1
 browser-policy-common@1.0.11
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
 browser-policy-framing@1.1.0
-caching-compiler@1.2.0
+caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 caching-html-compiler@1.1.2
-callback-hook@1.1.0
+callback-hook@1.0.10
 cfs:access-point@0.1.49
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
 cfs:collection@0.5.5
@@ -41,40 +41,38 @@ cfs:storage-adapter@0.2.3
 cfs:tempstore@0.1.5
 cfs:tempstore@0.1.5
 cfs:upload-http@0.0.20
 cfs:upload-http@0.0.20
 cfs:worker@0.1.4
 cfs:worker@0.1.4
-check@1.3.1
+check@1.2.5
 chuangbo:cookie@1.1.0
 chuangbo:cookie@1.1.0
-coffeescript@2.3.1_2
-coffeescript-compiler@2.3.1_2
+coffeescript@1.12.7_3
+coffeescript-compiler@1.12.7_3
 cottz:publish-relations@2.0.8
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
 ddp@1.4.0
-ddp-client@2.3.3
-ddp-common@1.4.0
+ddp-client@2.2.0
+ddp-common@1.3.0
 ddp-rate-limiter@1.0.7
 ddp-rate-limiter@1.0.7
-ddp-server@2.2.0
+ddp-server@2.1.1
 deps@1.0.12
 deps@1.0.12
-diff-sequence@1.1.0
-dynamic-import@0.5.0
-ecmascript@0.12.0
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
+diff-sequence@1.0.7
+dynamic-import@0.2.1
+ecmascript@0.9.0
+ecmascript-runtime@0.5.0
+ecmascript-runtime-client@0.5.0
+ecmascript-runtime-server@0.5.0
 ejson@1.1.0
 ejson@1.1.0
 eluck:accounts-lockout@0.9.0
 eluck:accounts-lockout@0.9.0
 email@1.2.3
 email@1.2.3
-es5-shim@4.8.0
+es5-shim@4.6.15
 fastclick@1.0.13
 fastclick@1.0.13
-fetch@0.1.0
 fortawesome:fontawesome@4.7.0
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
 geojson-utils@1.0.10
 horka:swipebox@1.0.2
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
 hot-code-push@1.0.4
 html-tools@1.0.11
 html-tools@1.0.11
 htmljs@1.0.11
 htmljs@1.0.11
-http@1.4.1
-id-map@1.1.0
+http@1.3.0
+id-map@1.0.9
 idmontie:migrations@1.0.3
 idmontie:migrations@1.0.3
-inter-process-messaging@0.1.0
 jquery@1.11.10
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:blaze-layout@2.3.0
 kadira:dochead@1.5.0
 kadira:dochead@1.5.0
@@ -83,12 +81,12 @@ kenton:accounts-sandstorm@0.7.0
 launch-screen@1.1.1
 launch-screen@1.1.1
 livedata@1.0.18
 livedata@1.0.18
 localstorage@1.2.0
 localstorage@1.2.0
-logging@1.1.20
+logging@1.1.19
 matb33:collection-hooks@0.8.4
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
 matteodem:easy-search@1.6.4
 mdg:validation-error@0.5.1
 mdg:validation-error@0.5.1
-meteor@1.9.2
-meteor-base@1.4.0
+meteor@1.8.2
+meteor-base@1.2.0
 meteor-platform@1.2.6
 meteor-platform@1.2.6
 meteorhacks:aggregate@1.3.0
 meteorhacks:aggregate@1.3.0
 meteorhacks:collection-utils@1.2.0
 meteorhacks:collection-utils@1.2.0
@@ -96,20 +94,18 @@ meteorhacks:meteorx@1.4.1
 meteorhacks:picker@1.0.3
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
 meteorhacks:subs-manager@1.6.4
 meteorspark:util@0.2.0
 meteorspark:util@0.2.0
-minifier-css@1.4.0
-minifier-js@2.4.0
+minifier-css@1.2.16
+minifier-js@2.2.2
 minifiers@1.1.8-faster-rebuild.0
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.5
+minimongo@1.4.3
 mixmax:smart-disconnect@0.0.4
 mixmax:smart-disconnect@0.0.4
 mobile-status-bar@1.0.14
 mobile-status-bar@1.0.14
-modern-browsers@0.1.2
-modules@0.13.0
-modules-runtime@0.10.2
+modules@0.11.0
+modules-runtime@0.9.1
 momentjs:moment@2.22.2
 momentjs:moment@2.22.2
-mongo@1.6.0
-mongo-decimal@0.1.0
+mongo@1.3.1
 mongo-dev-server@1.1.0
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
+mongo-id@1.0.6
 mongo-livedata@1.0.12
 mongo-livedata@1.0.12
 mousetrap:mousetrap@1.4.6_1
 mousetrap:mousetrap@1.4.6_1
 mquandalle:autofocus@1.0.0
 mquandalle:autofocus@1.0.0
@@ -123,48 +119,47 @@ mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
 mquandalle:perfect-scrollbar@0.6.5_2
 msavin:usercache@1.0.0
 msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
 npm-bcrypt@0.9.3
-npm-mongo@3.1.1
-oauth@1.2.3
-oauth2@1.2.1
+npm-mongo@2.2.33
+oauth@1.2.1
+oauth2@1.2.0
 observe-sequence@1.0.16
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
 ongoworks:speakingurl@1.1.0
-ordered-dict@1.1.0
+ordered-dict@1.0.9
 peerlibrary:assert@0.2.5
 peerlibrary:assert@0.2.5
 peerlibrary:base-component@0.16.0
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
 peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.9.0
+peerlibrary:computed-field@0.7.0
 peerlibrary:reactive-field@0.3.0
 peerlibrary:reactive-field@0.3.0
 perak:markdown@1.0.5
 perak:markdown@1.0.5
-promise@0.11.1
+promise@0.10.0
 raix:eventemitter@0.1.3
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
 raix:handlebar-helpers@0.2.5
 rajit:bootstrap3-datepicker@1.7.1
 rajit:bootstrap3-datepicker@1.7.1
-random@1.1.0
-rate-limit@1.0.9
-reactive-dict@1.2.1
+random@1.0.10
+rate-limit@1.0.8
+reactive-dict@1.2.0
 reactive-var@1.0.11
 reactive-var@1.0.11
-reload@1.2.0
-retry@1.1.0
-routepolicy@1.1.0
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
 rzymek:fullcalendar@3.8.0
 rzymek:fullcalendar@3.8.0
 salleman:accounts-oidc@1.0.9
 salleman:accounts-oidc@1.0.9
 salleman:oidc@1.0.9
 salleman:oidc@1.0.9
 service-configuration@1.0.11
 service-configuration@1.0.11
-session@1.1.8
+session@1.1.7
 sha@1.0.9
 sha@1.0.9
-shell-server@0.4.0
+shell-server@0.3.1
 simple:authenticate-user-by-token@1.0.1
 simple:authenticate-user-by-token@1.0.1
 simple:json-routes@2.1.0
 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
 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
-srp@1.0.12
-standard-minifier-css@1.5.0
-standard-minifier-js@2.4.0
+srp@1.0.10
+standard-minifier-css@1.3.5
+standard-minifier-js@2.2.3
 staringatlights:fast-render@2.16.5
 staringatlights:fast-render@2.16.5
 staringatlights:inject-data@2.0.5
 staringatlights:inject-data@2.0.5
 stylus@2.513.13
 stylus@2.513.13
@@ -174,15 +169,15 @@ templating@1.3.2
 templating-compiler@1.3.3
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-runtime@1.3.2
 templating-tools@1.1.2
 templating-tools@1.1.2
-tracker@1.2.0
+tracker@1.1.3
 ui@1.0.13
 ui@1.0.13
 underscore@1.0.10
 underscore@1.0.10
-url@1.2.0
+url@1.1.0
 useraccounts:core@1.14.2
 useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 verron:autosize@3.0.8
-webapp@1.7.0
+webapp@1.4.0
 webapp-hashing@1.0.9
 webapp-hashing@1.0.9
 wekan:accounts-cas@0.1.0
 wekan:accounts-cas@0.1.0
 wekan:wekan-ldap@0.0.2
 wekan:wekan-ldap@0.0.2

+ 1 - 1
Dockerfile

@@ -70,7 +70,7 @@ ARG LDAP_DEFAULT_DOMAIN
 # ENV BUILD_DEPS="paxctl"
 # ENV BUILD_DEPS="paxctl"
 ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
 ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
     NODE_VERSION=v8.12.0 \
     NODE_VERSION=v8.12.0 \
-    METEOR_RELEASE=1.8.1-beta.0 \
+    METEOR_RELEASE=1.6.0.1 \
     USE_EDGE=false \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
     METEOR_EDGE=1.5-beta.17 \
     NPM_VERSION=latest \
     NPM_VERSION=latest \

+ 2 - 13
docker-compose.yml

@@ -5,7 +5,7 @@ version: '2'
 services:
 services:
 
 
   wekandb:
   wekandb:
-    image: mongo:4.0.3
+    image: mongo:3.2.21
     container_name: wekan-db
     container_name: wekan-db
     restart: always
     restart: always
     command: mongod --smallfiles --oplogSize 128
     command: mongod --smallfiles --oplogSize 128
@@ -18,22 +18,11 @@ services:
       - wekan-db-dump:/dump
       - wekan-db-dump:/dump
 
 
   wekan:
   wekan:
-    image: quay.io/wekan/wekan:edge
+    image: quay.io/wekan/wekan
     container_name: wekan-app
     container_name: wekan-app
     restart: always
     restart: always
     networks:
     networks:
       - wekan-tier
       - wekan-tier
-    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:
     ports:
       # Docker outsideport:insideport
       # Docker outsideport:insideport
       - 80:8080
       - 80:8080

+ 3 - 3
snap-src/bin/config

@@ -9,15 +9,15 @@ keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM R
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
 "\t\t\t Default behaviour will preffer binding over unix socket, to disable unix socket binding set value to 'nill' string\n"\
 "\t\t\t Default behaviour will preffer binding over unix socket, to disable unix socket binding set value to 'nill' string\n"\
 "\t\t\t To bind to instance of mongodb provided through content interface,set value to relative path to the socket inside '$SNAP_DATA/shared' directory"
 "\t\t\t To bind to instance of mongodb provided through content interface,set value to relative path to the socket inside '$SNAP_DATA/shared' directory"
-DEFAULT_MONGODB_BIND_UNIX_SOCKET="$SNAP_DATA/share"
+DEFAULT_MONGODB_BIND_UNIX_SOCKET="/var/snap/wekan/current/share"
 KEY_MONGODB_BIND_UNIX_SOCKET="mongodb-bind-unix-socket"
 KEY_MONGODB_BIND_UNIX_SOCKET="mongodb-bind-unix-socket"
 
 
 DESCRIPTION_MONGODB_PORT="mongodb binding port: eg 27017 when using localhost"
 DESCRIPTION_MONGODB_PORT="mongodb binding port: eg 27017 when using localhost"
-DEFAULT_MONGODB_PORT=""
+DEFAULT_MONGODB_PORT="27019"
 KEY_MONGODB_PORT='mongodb-port'
 KEY_MONGODB_PORT='mongodb-port'
 
 
 DESCRIPTION_MONGODB_BIND_IP="mongodb binding ip address: eg 127.0.0.1 for localhost\n\t\tIf not defined default unix socket is used instead"
 DESCRIPTION_MONGODB_BIND_IP="mongodb binding ip address: eg 127.0.0.1 for localhost\n\t\tIf not defined default unix socket is used instead"
-DEFAULT_MONGODB_BIND_IP=""
+DEFAULT_MONGODB_BIND_IP="127.0.0.1"
 KEY_MONGODB_BIND_IP="mongodb-bind-ip"
 KEY_MONGODB_BIND_IP="mongodb-bind-ip"
 
 
 DESCRIPTION_MAIL_URL="wekan mail binding"
 DESCRIPTION_MAIL_URL="wekan mail binding"

+ 1 - 1
snapcraft.yaml

@@ -65,7 +65,7 @@ apps:
 
 
 parts:
 parts:
     mongodb:
     mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.0.3.tgz
+        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.21.tgz
         plugin: dump
         plugin: dump
         stage-packages: [libssl1.0.0]
         stage-packages: [libssl1.0.0]
         filesets:
         filesets: