Merge branch 'develop', prepare 1.1.1

Author: yamalight

.travis.yml

@@ -5,15 +5,15 @@ language: node_js
 services:
   - docker
 
-node_js: node
+node_js: 8
 
 cache: yarn
 
 before_install:
   - curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
 
-after_success:
+after_script:
   - docker rmi $(docker images -q)
   - yarn coveralls
   - yarn build

package.json

@@ -8,7 +8,7 @@
     "start": "node index.js",
     "test": "NODE_ENV=testing tap --timeout=300 --cov --coverage-report=lcov --reporter=spec ./test/index.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "build": "pkg -t node8.6.0-alpine -o exoframe-server ."
+    "build": "pkg -t node8.9.0-alpine -o exoframe-server ."
   },
   "pkg": {
     "assets": "src/templates/*.html"
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "coveralls": "^3.0.0",
-    "pkg": "^4.1.4",
+    "pkg": "^4.3.0-beta.1",
     "tap": "^11.0.0"
   }
 }

src/docker/start.js

@@ -45,13 +45,12 @@ module.exports = async ({image, username, resultStream}) => {
     Image: image,
     name,
     Env,
-    Labels: {
-      ...additionalLabels,
+    Labels: Object.assign({}, additionalLabels, {
       'exoframe.deployment': name,
       'exoframe.user': username,
       'exoframe.project': project,
       'traefik.backend': baseName,
-    },
+    }),
     HostConfig: {
       RestartPolicy,
     },

yarn.lock

@@ -1992,9 +1992,9 @@ pkg-dir@^1.0.0:
   dependencies:
     find-up "^1.0.0"
 
-pkg-fetch@2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.3.11.tgz#f1a194d86f4a802403d0e644b59aefb3cec565be"
+pkg-fetch@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.5.0.tgz#d1dadbb5cf0aff865c0ca4686202cf6827a8787b"
   dependencies:
     babel-runtime "6.25.0"
     byline "5.0.0"
@@ -2009,9 +2009,9 @@ pkg-fetch@2.3.11:
     semver "5.4.1"
     unique-temp-dir "1.0.0"
 
-pkg@^4.1.4:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.2.6.tgz#3e12f3b3202573d6efceb477629cf010ab1b9270"
+pkg@^4.3.0-beta.1:
+  version "4.3.0-beta.1"
+  resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.3.0-beta.1.tgz#1e73a73975eb4cdfddbc9ecff8afb586056c0cac"
   dependencies:
     acorn "5.1.1"
     babel-runtime "6.25.0"
@@ -2021,7 +2021,7 @@ pkg@^4.1.4:
     globby "6.1.0"
     minimist "1.2.0"
     multistream "2.1.0"
-    pkg-fetch "2.3.11"
+    pkg-fetch "2.5.0"
     progress "2.0.0"
     resolve "1.4.0"
     simple-bufferstream "1.0.0"