From 7b50ceb69f7b93c9a9cadd88b69f61341b79e218 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 28 Oct 2018 21:40:31 +0100 Subject: [PATCH] fix(clean): images are now cleaned in a more thorough way --- package-lock.json | 126 +++++++++++++------------------------------- package.json | 8 +-- ts/npmdocker.cli.ts | 2 +- 3 files changed, 41 insertions(+), 95 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4d3c71..0938588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,65 +78,15 @@ } }, "@gitzone/tsrun": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.12.tgz", - "integrity": "sha512-DOxqOg+evoxhgbzhzH4u6LaPF+6bpMsnBVl1QQaHzKPGBlNjaIY4yJ0RsGnWMgX1hlNLvbgHtl0Ky4A2MDvyrg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.13.tgz", + "integrity": "sha512-yJLXfqu33zGc1hBX4HGxzlBvb5DU2zs80MUd8UsULJvkgOBofb3XR7eyV7iZfP097sd+ABj17yoeqJcRRjOZTg==", "dev": true, "requires": { "@gitzone/tsbuild": "^2.0.22", "@pushrocks/smartfile": "^6.0.6", "ts-node": "^7.0.0", "typescript": "^3.0.1" - }, - "dependencies": { - "@pushrocks/smartfile": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.8.tgz", - "integrity": "sha512-YkAovvQ0pcVphXLynlQ1D4nhEoUqALqqUn2pRXc2vXNy0RDSU22puLlLVhoXT0NPAqYNMazhqc4OAixgEOpdFw==", - "dev": true, - "requires": { - "@pushrocks/smartpath": "^4.0.1", - "@pushrocks/smartpromise": "^2.0.5", - "@pushrocks/smartrequest": "^1.1.14", - "@types/fs-extra": "^5.0.4", - "@types/vinyl": "^2.0.2", - "fs-extra": "^7.0.0", - "glob": "^7.1.2", - "js-yaml": "^3.10.0", - "vinyl-file": "^3.0.0" - } - }, - "@pushrocks/smartrequest": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.1.14.tgz", - "integrity": "sha512-+sDQB4Mxvpn8BIMPUQ7TPSCKUVMln3tHC4rp4pmfEHmBQK+g1XwtNr59aMA9kEoBDMt7li1hu+1cs+SNsWt6Gw==", - "dev": true, - "requires": { - "@pushrocks/smartpromise": "^2.0.5", - "@types/form-data": "^2.2.1", - "form-data": "^2.3.2" - } - }, - "@types/fs-extra": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz", - "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "fs-extra": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz", - "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } } }, "@gitzone/tstest": { @@ -298,27 +248,17 @@ } }, "@pushrocks/smartcli": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@pushrocks/smartcli/-/smartcli-3.0.4.tgz", - "integrity": "sha512-ZuCPIZD+vPHmNP6BLdhP+GTptZEnLeGhUsykWss47MbZ0FvGeXm1r939qsx/wwijGT3F1rQIHkDA74VdQ2VDmw==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@pushrocks/smartcli/-/smartcli-3.0.6.tgz", + "integrity": "sha512-fCggmQXiu1URqMmzIta/8eBkBEfeWHwoErzQNTPFGpyVHw2Yhb5HBsatXUZUX5rBB+1o9xny9IzkLGyjI0lCww==", "requires": { "@pushrocks/lik": "^3.0.1", "@pushrocks/smartlog": "^2.0.1", + "@pushrocks/smartparam": "^1.0.4", "@pushrocks/smartpromise": "^2.0.5", "@types/yargs": "^11.1.1", - "rxjs": "^6.3.0", - "smartparam": "1.0.2", - "yargs": "^12.0.1" - }, - "dependencies": { - "rxjs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.2.tgz", - "integrity": "sha512-hV7criqbR0pe7EeL3O66UYVg92IR0XsA97+9y+BWTePK9SKmEI5Qd3Zj6uPnGkNzXsBywBQWTvujPl+1Kn9Zjw==", - "requires": { - "tslib": "^1.9.0" - } - } + "rxjs": "^6.3.2", + "yargs": "^12.0.2" } }, "@pushrocks/smartdelay": { @@ -378,6 +318,16 @@ "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz", "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA==" }, + "@pushrocks/smartparam": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@pushrocks/smartparam/-/smartparam-1.0.4.tgz", + "integrity": "sha512-UAqhnTQGBaJRptTK3qTd47Yt2ZTrAWByteow4auSNZD+k0xrpY9mTPPgKh0IwsURe0cZhj7zYNpGiekhKkL4rA==", + "requires": { + "@pushrocks/smartpromise": "^2.0.5", + "is-promise": "^2.1.0", + "minimatch": "^3.0.4" + } + }, "@pushrocks/smartpath": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz", @@ -399,9 +349,9 @@ } }, "@pushrocks/smartshell": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.6.tgz", - "integrity": "sha512-D48KB3DDqLfMjOXGEutqJi+v3Z4RcWacu5BJXxUwrecvd6oetbKobfmNGxeHSQPmNGb7U3ISfKwV6c5T5EZkJg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.8.tgz", + "integrity": "sha512-OeGrJez0vSHe/E0auHNUqf7r0B3yS+pkVe6BuxdJemJx5LBRtcHuZnJCxU5pSLL8igzlTfR+jVpjKJXUMzCsrA==", "requires": { "@pushrocks/smartpromise": "^2.0.5", "@types/which": "^1.3.1", @@ -548,9 +498,9 @@ "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==" }, "@types/node": { - "version": "10.9.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz", - "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==" + "version": "10.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz", + "integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ==" }, "@types/shelljs": { "version": "0.8.0", @@ -575,9 +525,9 @@ "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==" }, "@types/yargs": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-11.1.1.tgz", - "integrity": "sha512-Awgju4dqD8kHXX3jc/B/LaryJC7MsyNfnbN62lIbFzTi0GewH64zrkh4bxo/YTgVEK6r9V3GNecxMhXTJw0+jA==" + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-11.1.2.tgz", + "integrity": "sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w==" }, "ansi-256-colors": { "version": "1.1.0", @@ -1478,6 +1428,14 @@ "signal-exit": "^3.0.2" } }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1572,18 +1530,6 @@ } } }, - "smartparam": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/smartparam/-/smartparam-1.0.2.tgz", - "integrity": "sha512-Q09m98X6+WG9q0Wpj6LXXSqGdYUItLAsj5ypJ8pRkGtry2V4zZzhimv4xviViLIfrgIBn5uTfbjNU0is7+WRTA==", - "requires": { - "beautylog": "6.1.10", - "is-promise": "^2.1.0", - "minimatch": "^3.0.4", - "smartq": "^1.1.6", - "typings-global": "^1.0.20" - } - }, "smartq": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.6.tgz", diff --git a/package.json b/package.json index f5bfbef..6c32fa8 100644 --- a/package.json +++ b/package.json @@ -33,19 +33,19 @@ "homepage": "https://gitlab.com/gitzone/npmdocker#README", "devDependencies": { "@gitzone/tsbuild": "^2.0.22", - "@gitzone/tsrun": "^1.1.12", + "@gitzone/tsrun": "^1.1.13", "@gitzone/tstest": "^1.0.15", "@pushrocks/tapbundle": "^3.0.7", - "@types/node": "^10.9.4" + "@types/node": "^10.12.0" }, "dependencies": { "@pushrocks/npmextra": "^3.0.1", "@pushrocks/projectinfo": "^4.0.2", "@pushrocks/qenv": "^2.0.2", - "@pushrocks/smartcli": "^3.0.4", + "@pushrocks/smartcli": "^3.0.6", "@pushrocks/smartfile": "^6.0.8", "@pushrocks/smartpromise": "^2.0.5", - "@pushrocks/smartshell": "^2.0.6", + "@pushrocks/smartshell": "^2.0.8", "@pushrocks/smartstring": "^3.0.4", "@types/shelljs": "^0.8.0", "beautylog": "^6.1.10", diff --git a/ts/npmdocker.cli.ts b/ts/npmdocker.cli.ts index e2759ef..20134da 100644 --- a/ts/npmdocker.cli.ts +++ b/ts/npmdocker.cli.ts @@ -50,7 +50,7 @@ export let run = () => { await smartshellInstance.exec(`docker rm $(docker ps -a -q)`); plugins.beautylog.ora.text('removing images...'); - await smartshellInstance.exec(`docker rmi $(docker images -q -f dangling=true)`); + await smartshellInstance.exec(`docker rmi -f $(docker images -q -f dangling=true)`); plugins.beautylog.ora.text('removing all other images...'); await smartshellInstance.exec(`docker rmi $(docker images -a -q)`);