now cleaning up correctly
This commit is contained in:
parent
d3d3363e1b
commit
d2cd294b36
7
dist/npmdocker.config.js
vendored
7
dist/npmdocker.config.js
vendored
@ -24,8 +24,9 @@ let getQenvKeyValueObject = () => __awaiter(this, void 0, void 0, function* () {
|
|||||||
let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
|
let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
|
||||||
let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
|
let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
|
||||||
let config = npmextra.dataFor('npmdocker', {
|
let config = npmextra.dataFor('npmdocker', {
|
||||||
baseImage: 'hosttoday/ht-docker-node:npmci',
|
baseImage: 'hosttoday/ht-docker-node:npmdocker',
|
||||||
command: 'npmci test stable',
|
init: 'rm -rf node_nodules/ && yarn install',
|
||||||
|
command: 'npmci npm test',
|
||||||
dockerSock: false,
|
dockerSock: false,
|
||||||
keyValueObjectArray: qenvKeyValueObjectArrayArg
|
keyValueObjectArray: qenvKeyValueObjectArrayArg
|
||||||
});
|
});
|
||||||
@ -35,4 +36,4 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () {
|
|||||||
let config = yield getQenvKeyValueObject().then(buildConfig);
|
let config = yield getQenvKeyValueObject().then(buildConfig);
|
||||||
return config;
|
return config;
|
||||||
});
|
});
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUcsR0FBUyxFQUFFO0lBQ3JDLElBQUksdUJBQTBDLENBQUE7SUFDOUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEYsdUJBQXVCLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDLG1CQUFtQixDQUFBO0lBQzNGLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLHVCQUF1QixHQUFHLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBQ0QsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkMsRUFBRSxFQUFFO0lBQ3hFLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZELElBQUksTUFBTSxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQzNCLFdBQVcsRUFDWDtRQUNFLFNBQVMsRUFBRSxnQ0FBZ0M7UUFDM0MsT0FBTyxFQUFFLG1CQUFtQjtRQUM1QixVQUFVLEVBQUUsS0FBSztRQUNqQixtQkFBbUIsRUFBRSwwQkFBMEI7S0FDaEQsQ0FDRixDQUFBO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBO0FBRVUsUUFBQSxHQUFHLEdBQUcsR0FBMkIsRUFBRTtJQUM1QyxJQUFJLE1BQU0sR0FBRyxNQUFNLHFCQUFxQixFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQzVELE1BQU0sQ0FBQyxNQUFNLENBQUE7QUFDZixDQUFDLENBQUEsQ0FBQSJ9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUcsR0FBUyxFQUFFO0lBQ3JDLElBQUksdUJBQTBDLENBQUE7SUFDOUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEYsdUJBQXVCLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDLG1CQUFtQixDQUFBO0lBQzNGLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLHVCQUF1QixHQUFHLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBQ0QsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkMsRUFBRSxFQUFFO0lBQ3hFLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZELElBQUksTUFBTSxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQzNCLFdBQVcsRUFDWDtRQUNFLFNBQVMsRUFBRSxvQ0FBb0M7UUFDL0MsSUFBSSxFQUFFLHNDQUFzQztRQUM1QyxPQUFPLEVBQUUsZ0JBQWdCO1FBQ3pCLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFBO0FBQ2YsQ0FBQyxDQUFBLENBQUE7QUFFVSxRQUFBLEdBQUcsR0FBRyxHQUEyQixFQUFFO0lBQzVDLElBQUksTUFBTSxHQUFHLE1BQU0scUJBQXFCLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDNUQsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBIn0=
|
4
dist/npmdocker.docker.js
vendored
4
dist/npmdocker.docker.js
vendored
File diff suppressed because one or more lines are too long
@ -27,8 +27,9 @@ let buildConfig = async (qenvKeyValueObjectArrayArg: IKeyValueObject[]) => {
|
|||||||
let config = npmextra.dataFor<IConfig>(
|
let config = npmextra.dataFor<IConfig>(
|
||||||
'npmdocker',
|
'npmdocker',
|
||||||
{
|
{
|
||||||
baseImage: 'hosttoday/ht-docker-node:npmci',
|
baseImage: 'hosttoday/ht-docker-node:npmdocker',
|
||||||
command: 'npmci test stable',
|
init: 'rm -rf node_nodules/ && yarn install',
|
||||||
|
command: 'npmci npm test',
|
||||||
dockerSock: false,
|
dockerSock: false,
|
||||||
keyValueObjectArray: qenvKeyValueObjectArrayArg
|
keyValueObjectArray: qenvKeyValueObjectArrayArg
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ let postClean = async () => {
|
|||||||
.then(async () => {
|
.then(async () => {
|
||||||
plugins.beautylog.ok('cleaned up!')
|
plugins.beautylog.ok('cleaned up!')
|
||||||
})
|
})
|
||||||
await plugins.smartfile.fs.remove(paths.npmdockerFile)
|
plugins.smartfile.fs.removeSync(paths.npmdockerFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
export let run = async (configArg: IConfig): Promise<IConfig> => {
|
export let run = async (configArg: IConfig): Promise<IConfig> => {
|
||||||
|
Loading…
Reference in New Issue
Block a user