fix docker testing
This commit is contained in:
parent
977ecabb41
commit
34753a4ae0
@ -1,6 +1,6 @@
|
|||||||
FROM hosttoday/ht-docker-node:npmci
|
FROM hosttoday/ht-docker-node:npmci
|
||||||
RUN yarn global add npmdocker
|
RUN yarn global add npmdocker
|
||||||
COPY ./buildContextDir /workspace
|
COPY ./ /workspace
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
ENV CI=true
|
ENV CI=true
|
||||||
CMD ["npmdocker","runinside"];
|
CMD ["npmdocker","runinside"];
|
||||||
|
2
dist/npmdocker.cli.js
vendored
2
dist/npmdocker.cli.js
vendored
@ -82,4 +82,4 @@ exports.run = () => {
|
|||||||
}));
|
}));
|
||||||
npmdockerCli.startParse();
|
npmdockerCli.startParse();
|
||||||
};
|
};
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUc5QyxVQUFVO0FBQ1YsbURBQWtEO0FBQ2xELG1EQUFrRDtBQUdsRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxjQUFjLENBQUMsU0FBUyxDQUFDO0lBQzVELFdBQVcsRUFBRSw2QkFBNkI7SUFDMUMsT0FBTyxFQUFFLFdBQVc7SUFDcEIsU0FBUyxFQUFFLFNBQVM7Q0FDckIsQ0FBQyxDQUFBO0FBQ0Ysa0JBQWtCLENBQUMsV0FBVyxDQUFDLGtCQUFrQixFQUFFO0lBQ2pELFFBQVEsRUFBRSxVQUFVO0NBQ3JCLENBQUMsQ0FBQTtBQUVGLElBQUksWUFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUV2QyxRQUFBLEdBQUcsR0FBRztJQUNmLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBTyxPQUFPO1FBQzdDLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3pDLElBQUksU0FBUyxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRTthQUNyQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1FBQ3pELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUN6RixP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
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUc5QyxVQUFVO0FBQ1YsbURBQWtEO0FBQ2xELG1EQUFrRDtBQUdsRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxjQUFjLENBQUMsU0FBUyxDQUFDO0lBQzVELFdBQVcsRUFBRSw2QkFBNkI7SUFDMUMsT0FBTyxFQUFFLFdBQVc7SUFDcEIsU0FBUyxFQUFFLFNBQVM7Q0FDckIsQ0FBQyxDQUFBO0FBQ0Ysa0JBQWtCLENBQUMsV0FBVyxDQUFDLGtCQUFrQixFQUFFO0lBQ2pELFFBQVEsRUFBRSxVQUFVO0NBQ3JCLENBQUMsQ0FBQTtBQUVGLElBQUksWUFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUV2QyxRQUFBLEdBQUcsR0FBRyxHQUFHLEVBQUU7SUFDcEIsWUFBWSxDQUFDLFlBQVksRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU8sRUFBRSxFQUFFO1FBQ2pELE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3pDLElBQUksU0FBUyxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRTthQUNyQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1FBQ3pELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUN6RixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2pCLENBQUM7SUFDSCxDQUFDLENBQUEsQ0FBQyxDQUFBO0lBRUY7O09BRUc7SUFDSCxZQUFZLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU8sRUFBRSxFQUFFO1FBQzFELE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGlDQUFpQyxDQUFDLENBQUE7UUFDdkQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsMENBQTBDLENBQUMsQ0FBQTtRQUNqRSxJQUFJLFNBQVMsR0FBRyxNQUFNLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUN4QyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDL0QsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ2pCLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQSxDQUFDLENBQUE7SUFFRixZQUFZLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU8sRUFBRSxFQUFFO1FBQ3RELE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxDQUFBO1FBQ3ZELEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQywwQ0FBMEMsQ0FBQyxDQUFBO1lBQ3RFLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtZQUU1RCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQTtZQUM1RCxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUE7WUFFN0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUE7WUFDaEQsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxpREFBaUQsQ0FBQyxDQUFBO1lBRWhGLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFBO1lBQzFELE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQTtZQUVsRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsQ0FBQTtZQUNyRCxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDBEQUEwRCxDQUFDLENBQUE7UUFDM0YsQ0FBQztRQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO0lBQ2pFLENBQUMsQ0FBQSxDQUFDLENBQUE7SUFFRixZQUFZLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU8sRUFBRSxFQUFFO1FBQzFELE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLG9CQUFvQixDQUFDLENBQUE7UUFDMUMsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxrRUFBa0UsQ0FBQyxDQUFBO0lBQ25HLENBQUMsQ0FBQSxDQUFDLENBQUE7SUFFRixZQUFZLENBQUMsVUFBVSxFQUFFLENBQUE7QUFDM0IsQ0FBQyxDQUFBIn0=
|
3
dist/npmdocker.config.js
vendored
3
dist/npmdocker.config.js
vendored
@ -19,7 +19,6 @@ let getQenvKeyValueObject = () => __awaiter(this, void 0, void 0, function* () {
|
|||||||
else {
|
else {
|
||||||
qenvKeyValueObjectArray = [];
|
qenvKeyValueObjectArray = [];
|
||||||
}
|
}
|
||||||
;
|
|
||||||
return qenvKeyValueObjectArray;
|
return qenvKeyValueObjectArray;
|
||||||
});
|
});
|
||||||
let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
|
let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
|
||||||
@ -36,4 +35,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUc7SUFDMUIsSUFBSSx1QkFBMEMsQ0FBQTtJQUM5QyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsRix1QkFBdUIsR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUMsbUJBQW1CLENBQUE7SUFDM0YsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sdUJBQXVCLEdBQUcsRUFBRSxDQUFBO0lBQzlCLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkM7SUFDcEUsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDdkQsSUFBSSxNQUFNLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FDM0IsV0FBVyxFQUNYO1FBQ0UsU0FBUyxFQUFFLGdDQUFnQztRQUMzQyxPQUFPLEVBQUUsbUJBQW1CO1FBQzVCLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFBO0FBQ2YsQ0FBQyxDQUFBLENBQUE7QUFFVSxRQUFBLEdBQUcsR0FBRztJQUNmLElBQUksTUFBTSxHQUFHLE1BQU0scUJBQXFCLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDNUQsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBIn0=
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUcsR0FBUyxFQUFFO0lBQ3JDLElBQUksdUJBQTBDLENBQUE7SUFDOUMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEYsdUJBQXVCLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDLG1CQUFtQixDQUFBO0lBQzNGLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLHVCQUF1QixHQUFHLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBQ0QsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkMsRUFBRSxFQUFFO0lBQ3hFLElBQUksUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZELElBQUksTUFBTSxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQzNCLFdBQVcsRUFDWDtRQUNFLFNBQVMsRUFBRSxnQ0FBZ0M7UUFDM0MsT0FBTyxFQUFFLG1CQUFtQjtRQUM1QixVQUFVLEVBQUUsS0FBSztRQUNqQixtQkFBbUIsRUFBRSwwQkFBMEI7S0FDaEQsQ0FDRixDQUFBO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBO0FBRVUsUUFBQSxHQUFHLEdBQUcsR0FBMkIsRUFBRTtJQUM1QyxJQUFJLE1BQU0sR0FBRyxNQUFNLHFCQUFxQixFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQzVELE1BQU0sQ0FBQyxNQUFNLENBQUE7QUFDZixDQUFDLENBQUEsQ0FBQSJ9
|
39
dist/npmdocker.docker.js
vendored
39
dist/npmdocker.docker.js
vendored
File diff suppressed because one or more lines are too long
3
dist/npmdocker.paths.d.ts
vendored
3
dist/npmdocker.paths.d.ts
vendored
@ -1,5 +1,4 @@
|
|||||||
export declare let cwd: string;
|
export declare let cwd: string;
|
||||||
export declare let packageBase: string;
|
export declare let packageBase: string;
|
||||||
export declare let assets: string;
|
export declare let assets: string;
|
||||||
export declare let buildContextDir: string;
|
export declare let npmdockerFile: string;
|
||||||
export declare let dockerfile: string;
|
|
||||||
|
7
dist/npmdocker.paths.js
vendored
7
dist/npmdocker.paths.js
vendored
@ -6,8 +6,5 @@ exports.cwd = process.cwd();
|
|||||||
exports.packageBase = plugins.path.join(__dirname, "../");
|
exports.packageBase = plugins.path.join(__dirname, "../");
|
||||||
exports.assets = plugins.path.join(exports.packageBase, "assets/");
|
exports.assets = plugins.path.join(exports.packageBase, "assets/");
|
||||||
plugins.smartfile.fs.ensureDirSync(exports.assets);
|
plugins.smartfile.fs.ensureDirSync(exports.assets);
|
||||||
exports.buildContextDir = plugins.path.join(exports.assets, "buildContextDir");
|
exports.npmdockerFile = plugins.path.join(exports.cwd, 'npmdocker');
|
||||||
plugins.smartfile.fs.ensureDirSync(exports.buildContextDir);
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQThDO0FBRTlDLGNBQWM7QUFDSCxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7QUFDbkIsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ2pELFFBQUEsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUUsU0FBUyxDQUFDLENBQUE7QUFDN0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLGNBQU0sQ0FBQyxDQUFBO0FBQy9CLFFBQUEsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQUcsRUFBRSxXQUFXLENBQUMsQ0FBQSJ9
|
||||||
// files
|
|
||||||
exports.dockerfile = plugins.path.join(exports.assets, "Dockerfile");
|
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBRS9DLGNBQWM7QUFDSCxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDcEIsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2xELFFBQUEsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLGNBQU0sQ0FBQyxDQUFDO0FBRWhDLFFBQUEsZUFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBQ3pFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyx1QkFBZSxDQUFDLENBQUM7QUFFcEQsUUFBUTtBQUNHLFFBQUEsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBRSxZQUFZLENBQUMsQ0FBQyJ9
|
|
34
dist/npmdocker.snippets.js
vendored
34
dist/npmdocker.snippets.js
vendored
@ -1,14 +1,32 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
Object.defineProperty(exports, "__esModule", { value: true });
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
const plugins = require("./npmdocker.plugins");
|
const plugins = require("./npmdocker.plugins");
|
||||||
|
let getMountSolutionString = (optionsArg) => {
|
||||||
|
if (process.env.CI) {
|
||||||
|
return 'COPY ./ /workspace';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return '# not copying workspcae since not in CI';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let getGlobalPreparationString = (optionsArg) => {
|
||||||
|
if (optionsArg.baseImage !== 'hosttoday/ht-docker-node:npmdocker') {
|
||||||
|
return 'RUN yarn global add npmdocker';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return '# not installing npmdocker since it is included in the base image';
|
||||||
|
}
|
||||||
|
};
|
||||||
exports.dockerfileSnippet = (optionsArg) => {
|
exports.dockerfileSnippet = (optionsArg) => {
|
||||||
return plugins.smartstring.indent.normalize(`
|
return plugins.smartstring.indent.normalize(`
|
||||||
FROM ${optionsArg.baseImage}
|
FROM ${optionsArg.baseImage}
|
||||||
RUN yarn global add npmdocker
|
# For info about what npmdocker does read the docs at https://gitzone.github.io/npmdocker
|
||||||
COPY ./buildContextDir /workspace
|
${getGlobalPreparationString(optionsArg)}
|
||||||
WORKDIR /workspace
|
${getMountSolutionString(optionsArg)}
|
||||||
ENV CI=true
|
WORKDIR /workspace
|
||||||
CMD ["npmdocker","runinside"];
|
ENV CI=true
|
||||||
`);
|
ENTRYPOINT ["npmdocker"]
|
||||||
|
CMD ["runinside"]
|
||||||
|
`);
|
||||||
};
|
};
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBT3BDLFFBQUEsaUJBQWlCLEdBQUcsQ0FBQyxVQUE4QjtJQUM1RCxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2VBQy9CLFVBQVUsQ0FBQyxTQUFTOzs7Ozs7S0FNOUIsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBIn0=
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBTy9DLElBQUksc0JBQXNCLEdBQUcsQ0FBQyxVQUE4QixFQUFFLEVBQUU7SUFDOUQsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ25CLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQTtJQUM3QixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixNQUFNLENBQUMseUNBQXlDLENBQUE7SUFDbEQsQ0FBQztBQUNILENBQUMsQ0FBQTtBQUVELElBQUksMEJBQTBCLEdBQUcsQ0FBQyxVQUE4QixFQUFFLEVBQUU7SUFDbEUsRUFBRSxDQUFDLENBQUMsVUFBVSxDQUFDLFNBQVMsS0FBSyxvQ0FBb0MsQ0FBQyxDQUFDLENBQUM7UUFDbEUsTUFBTSxDQUFDLCtCQUErQixDQUFBO0lBQ3hDLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLE1BQU0sQ0FBQyxtRUFBbUUsQ0FBQTtJQUM1RSxDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBRVUsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLFVBQThCLEVBQVUsRUFBRTtJQUN4RSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUN6QztPQUNHLFVBQVUsQ0FBQyxTQUFTOztFQUV6QiwwQkFBMEIsQ0FBQyxVQUFVLENBQUM7RUFDdEMsc0JBQXNCLENBQUMsVUFBVSxDQUFDOzs7OztDQUtuQyxDQUNFLENBQUE7QUFDSCxDQUFDLENBQUEifQ==
|
@ -1,8 +1,7 @@
|
|||||||
{
|
{
|
||||||
"npmts":{
|
"npmts":{
|
||||||
"mode":"default",
|
"mode":"default",
|
||||||
"cli":true,
|
"cli":true
|
||||||
"dockerSock":true
|
|
||||||
},
|
},
|
||||||
"npmci": {
|
"npmci": {
|
||||||
"npmGlobalTools": [
|
"npmGlobalTools": [
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
"test": "test"
|
"test": "test"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(npm run clean && npm run compile && npm run setupCheck && npm run testStandard && npm run testSpeed && npm run testClean)",
|
"test": "(npm run clean && npm run compile && npm run setupCheck && npm run testStandard && npm run testSpeed)",
|
||||||
"testStandard": "(cd test/ && node ../dist/index.js)",
|
"testStandard": "(cd test/ && node ../dist/index.js)",
|
||||||
"testSpeed": "(cd test/ && node ../dist/index.js speedtest)",
|
"testSpeed": "(cd test/ && node ../dist/index.js speedtest)",
|
||||||
"testClean": "(cd test/ && node ../dist/index.js clean --all)",
|
"testClean": "(cd test/ && node ../dist/index.js clean --all)",
|
||||||
|
@ -18,7 +18,7 @@ let getQenvKeyValueObject = async () => {
|
|||||||
qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray
|
qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray
|
||||||
} else {
|
} else {
|
||||||
qenvKeyValueObjectArray = []
|
qenvKeyValueObjectArray = []
|
||||||
};
|
}
|
||||||
return qenvKeyValueObjectArray
|
return qenvKeyValueObjectArray
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './npmdocker.plugins';
|
import * as plugins from './npmdocker.plugins'
|
||||||
import * as paths from './npmdocker.paths';
|
import * as paths from './npmdocker.paths'
|
||||||
import * as snippets from './npmdocker.snippets'
|
import * as snippets from './npmdocker.snippets'
|
||||||
|
|
||||||
// interfaces
|
// interfaces
|
||||||
@ -45,8 +45,9 @@ let buildDockerFile = () => {
|
|||||||
})
|
})
|
||||||
plugins.beautylog.info(`Base image is: ${config.baseImage}`)
|
plugins.beautylog.info(`Base image is: ${config.baseImage}`)
|
||||||
plugins.beautylog.info(`Command is: ${config.command}`)
|
plugins.beautylog.info(`Command is: ${config.command}`)
|
||||||
plugins.smartfile.memory.toFsSync(dockerfile, paths.dockerfile)
|
plugins.smartfile.memory.toFsSync(dockerfile, plugins.path.join(paths.cwd, 'npmdocker'))
|
||||||
plugins.beautylog.ok('Dockerfile created!')
|
plugins.beautylog.ok('Dockerfile created!')
|
||||||
|
plugins.beautylog.ora.stop()
|
||||||
done.resolve()
|
done.resolve()
|
||||||
return done.promise
|
return done.promise
|
||||||
}
|
}
|
||||||
@ -55,26 +56,19 @@ let buildDockerFile = () => {
|
|||||||
* builds the Dockerimage from the built Dockerfile
|
* builds the Dockerimage from the built Dockerfile
|
||||||
*/
|
*/
|
||||||
let buildDockerImage = async () => {
|
let buildDockerImage = async () => {
|
||||||
plugins.beautylog.ora.text('pulling latest base image from registry...')
|
plugins.beautylog.info('pulling latest base image from registry...')
|
||||||
await plugins.smartshell.execSilent(
|
await plugins.smartshell.exec(
|
||||||
`docker pull ${config.baseImage}`
|
`docker pull ${config.baseImage}`
|
||||||
).then(async () => {
|
)
|
||||||
plugins.beautylog.ora.text('building Dockerimage...')
|
plugins.beautylog.ora.text('building Dockerimage...')
|
||||||
// are we creating a build context form project ?
|
let execResult = await plugins.smartshell.execSilent(
|
||||||
if (process.env.CI === 'true') {
|
`docker build -f npmdocker -t ${dockerData.imageTag} ${paths.cwd}`
|
||||||
plugins.beautylog.ora.text('creating build context...')
|
)
|
||||||
plugins.smartfile.fs.copySync(paths.cwd, paths.buildContextDir)
|
if (execResult.exitCode !== 0) {
|
||||||
}
|
console.log(execResult.stdout)
|
||||||
await plugins.smartshell.execSilent(
|
process.exit(1)
|
||||||
`docker build -f ${paths.dockerfile} -t ${dockerData.imageTag} ${paths.assets}`
|
}
|
||||||
).then(async (response) => {
|
plugins.beautylog.ok('Dockerimage built!')
|
||||||
if (response.exitCode !== 0) {
|
|
||||||
console.log(response.stdout)
|
|
||||||
process.exit(1)
|
|
||||||
}
|
|
||||||
plugins.beautylog.ok('Dockerimage built!')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let buildDockerProjectMountString = async () => {
|
let buildDockerProjectMountString = async () => {
|
||||||
@ -89,7 +83,7 @@ let buildDockerProjectMountString = async () => {
|
|||||||
let buildDockerEnvString = async () => {
|
let buildDockerEnvString = async () => {
|
||||||
for (let keyValueObjectArg of config.keyValueObjectArray) {
|
for (let keyValueObjectArg of config.keyValueObjectArray) {
|
||||||
let envString = dockerData.dockerEnvString = dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `
|
let envString = dockerData.dockerEnvString = dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -130,13 +124,6 @@ let deleteDockerImage = async () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* cleans up, deletes the build context
|
|
||||||
*/
|
|
||||||
let deleteBuildContext = async () => {
|
|
||||||
await plugins.smartfile.fs.remove(paths.buildContextDir)
|
|
||||||
}
|
|
||||||
|
|
||||||
let preClean = async () => {
|
let preClean = async () => {
|
||||||
await deleteDockerImage()
|
await deleteDockerImage()
|
||||||
.then(deleteDockerContainer)
|
.then(deleteDockerContainer)
|
||||||
@ -148,14 +135,12 @@ let preClean = async () => {
|
|||||||
let postClean = async () => {
|
let postClean = async () => {
|
||||||
await deleteDockerContainer()
|
await deleteDockerContainer()
|
||||||
.then(deleteDockerImage)
|
.then(deleteDockerImage)
|
||||||
.then(deleteBuildContext)
|
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
plugins.beautylog.ok('cleaned up!')
|
plugins.beautylog.ok('cleaned up!')
|
||||||
})
|
})
|
||||||
|
await plugins.smartfile.fs.remove(paths.npmdockerFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export let run = async (configArg: IConfig): Promise<IConfig> => {
|
export let run = async (configArg: IConfig): Promise<IConfig> => {
|
||||||
plugins.beautylog.ora.start()
|
plugins.beautylog.ora.start()
|
||||||
config = configArg
|
config = configArg
|
||||||
|
@ -1,13 +1,8 @@
|
|||||||
import * as plugins from "./npmdocker.plugins";
|
import * as plugins from "./npmdocker.plugins"
|
||||||
|
|
||||||
// directories
|
// directories
|
||||||
export let cwd = process.cwd();
|
export let cwd = process.cwd()
|
||||||
export let packageBase = plugins.path.join(__dirname, "../");
|
export let packageBase = plugins.path.join(__dirname, "../")
|
||||||
export let assets = plugins.path.join(packageBase, "assets/");
|
export let assets = plugins.path.join(packageBase, "assets/")
|
||||||
plugins.smartfile.fs.ensureDirSync(assets);
|
plugins.smartfile.fs.ensureDirSync(assets)
|
||||||
|
export let npmdockerFile = plugins.path.join(cwd, 'npmdocker')
|
||||||
export let buildContextDir = plugins.path.join(assets,"buildContextDir");
|
|
||||||
plugins.smartfile.fs.ensureDirSync(buildContextDir);
|
|
||||||
|
|
||||||
// files
|
|
||||||
export let dockerfile = plugins.path.join(assets, "Dockerfile");
|
|
||||||
|
@ -1,17 +1,37 @@
|
|||||||
import * as plugins from "./npmdocker.plugins";
|
import * as plugins from "./npmdocker.plugins";
|
||||||
|
|
||||||
export interface IDockerfileSnippet {
|
export interface IDockerfileSnippet {
|
||||||
baseImage: string;
|
baseImage: string
|
||||||
command: string;
|
command: string
|
||||||
|
}
|
||||||
|
|
||||||
|
let getMountSolutionString = (optionsArg: IDockerfileSnippet) => {
|
||||||
|
if (process.env.CI) {
|
||||||
|
return 'COPY ./ /workspace'
|
||||||
|
} else {
|
||||||
|
return '# not copying workspcae since not in CI'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let getGlobalPreparationString = (optionsArg: IDockerfileSnippet) => {
|
||||||
|
if (optionsArg.baseImage !== 'hosttoday/ht-docker-node:npmdocker') {
|
||||||
|
return 'RUN yarn global add npmdocker'
|
||||||
|
} else {
|
||||||
|
return '# not installing npmdocker since it is included in the base image'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
|
export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
|
||||||
return plugins.smartstring.indent.normalize(`
|
return plugins.smartstring.indent.normalize(
|
||||||
FROM ${optionsArg.baseImage}
|
`
|
||||||
RUN yarn global add npmdocker
|
FROM ${optionsArg.baseImage}
|
||||||
COPY ./buildContextDir /workspace
|
# For info about what npmdocker does read the docs at https://gitzone.github.io/npmdocker
|
||||||
WORKDIR /workspace
|
${getGlobalPreparationString(optionsArg)}
|
||||||
ENV CI=true
|
${getMountSolutionString(optionsArg)}
|
||||||
CMD ["npmdocker","runinside"];
|
WORKDIR /workspace
|
||||||
`)
|
ENV CI=true
|
||||||
|
ENTRYPOINT ["npmdocker"]
|
||||||
|
CMD ["runinside"]
|
||||||
|
`
|
||||||
|
)
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user