@giteeteam/apps-cli 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/index.js +10 -6
  2. package/package.json +2 -2
package/dist/index.js CHANGED
@@ -31,7 +31,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
31
31
  var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
32
32
  var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
33
33
 
34
- var version = "0.2.0";
34
+ var version = "0.2.1";
35
35
 
36
36
  const packageApp = async ({ outputDir, manifest, copyFiles }) => {
37
37
  const { resources } = manifest;
@@ -389,6 +389,8 @@ class DockerService {
389
389
  console.log(`Download image(${this.imageName}) success`);
390
390
  }
391
391
  async runContainer({ port, env, name, volume = [] }) {
392
+ // 先删掉容器
393
+ await this.removeContainer(name);
392
394
  const envStr = Object.keys(env)
393
395
  .map(k => `-e ${k}=${env[k]}`)
394
396
  .join(' ');
@@ -400,10 +402,12 @@ class DockerService {
400
402
  await this.execPromise(`docker rm -f ${containerName}`);
401
403
  }
402
404
  execPromise(cmd) {
403
- return new Promise(resolve => {
405
+ return new Promise((resolve, reject) => {
404
406
  child_process__default["default"].exec(cmd, (err, stdout, stderr) => {
407
+ if (err) {
408
+ return reject(err);
409
+ }
405
410
  resolve({
406
- err: err,
407
411
  stdout: stdout,
408
412
  stderr: stderr,
409
413
  });
@@ -469,9 +473,9 @@ var run = async (options) => {
469
473
  volume: [`${outputDir}:/usr/src/app/apps`],
470
474
  name: containerName,
471
475
  });
472
- process.on('SIGINT', () => {
473
- console.log('process,SIGINT');
474
- dockerService.removeContainer(containerName);
476
+ process.on('SIGINT', async () => {
477
+ await dockerService.removeContainer(containerName);
478
+ await fse__default["default"].remove(outputDir);
475
479
  process.exit();
476
480
  });
477
481
  await copyManifest(pluginDir);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@giteeteam/apps-cli",
3
- "version": "0.2.0",
3
+ "version": "0.2.1",
4
4
  "description": "Giteeteam Apps cli",
5
5
  "keywords": [
6
6
  "typescript",
@@ -59,5 +59,5 @@
59
59
  "@types/inquirer": "^8.2.1",
60
60
  "@types/uuid": "^8.3.4"
61
61
  },
62
- "gitHead": "11be8747537fcd607f97a80f5f3e07a592e85b14"
62
+ "gitHead": "668caac9b1c7f4a82beb57b615ef827a84912823"
63
63
  }