Merge branch 'develop', prepare 6.1.4

yamalight · yamalight · commit ae5a81c14449 · 2020-05-08T12:03:21.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ dist/
 
 package-lock.json
 exoframe.json
+yarn.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exoframe",
-  "version": "6.1.3",
+  "version": "6.1.4-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "dist/index.js",
   "repository": "git@github.com:exoframejs/exoframe.git",
diff --git a/src/commands/deploy.js b/src/commands/deploy.js
@@ -183,7 +183,7 @@ exports.handler = async (args = {}) => {
   const tarStream = tar.pack(workdir, {
     // ignore files from ignore list
     ignore: name => {
-      const relativePath = name.replace(`${workdir}/`, '');
+      const relativePath = path.relative(workdir, name);
       const result = multimatch([relativePath], ignores).length !== 0;
       return result;
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "exoframe",`
`3`		`- "version": "6.1.3",`
	`3`	`+ "version": "6.1.4-dev",`
`4`	`4`	`"description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"repository": "[email protected]:exoframejs/exoframe.git",`