Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b31cc4cbbf | |||
| d1e7448b40 | |||
| e541159019 | |||
| b6c06e2b17 |
6
dist/npmci.bash.d.ts
vendored
6
dist/npmci.bash.d.ts
vendored
@@ -9,11 +9,7 @@ export declare let yarnAvailable: plugins.q.Deferred<boolean>;
|
|||||||
* @param commandArg - The command to execute
|
* @param commandArg - The command to execute
|
||||||
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
||||||
*/
|
*/
|
||||||
export declare let bash: (commandArg: string, retryArg?: number, bareArg?: boolean) => Promise<string>;
|
export declare let bash: (commandArg: string, retryArg?: number) => Promise<string>;
|
||||||
/**
|
|
||||||
* bashBare allows usage of bash without sourcing any files like nvm
|
|
||||||
*/
|
|
||||||
export declare let bashBare: (commandArg: string, retryArg?: number) => Promise<string>;
|
|
||||||
/**
|
/**
|
||||||
* bashNoError allows executing stuff without throwing an error
|
* bashNoError allows executing stuff without throwing an error
|
||||||
*/
|
*/
|
||||||
|
|||||||
19
dist/npmci.bash.js
vendored
19
dist/npmci.bash.js
vendored
@@ -40,7 +40,6 @@ let checkToolsAvailable = () => __awaiter(this, void 0, void 0, function* () {
|
|||||||
else {
|
else {
|
||||||
exports.nvmAvailable.resolve(false);
|
exports.nvmAvailable.resolve(false);
|
||||||
}
|
}
|
||||||
;
|
|
||||||
// check for yarn
|
// check for yarn
|
||||||
yield plugins.smartshell.which('yarn').then(() => __awaiter(this, void 0, void 0, function* () {
|
yield plugins.smartshell.which('yarn').then(() => __awaiter(this, void 0, void 0, function* () {
|
||||||
yield plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
|
yield plugins.smartshell.exec(`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`);
|
||||||
@@ -58,7 +57,7 @@ checkToolsAvailable();
|
|||||||
* @param commandArg - The command to execute
|
* @param commandArg - The command to execute
|
||||||
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
||||||
*/
|
*/
|
||||||
exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, void 0, void 0, function* () {
|
exports.bash = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
|
||||||
yield exports.nvmAvailable.promise; // make sure nvm check has run
|
yield exports.nvmAvailable.promise; // make sure nvm check has run
|
||||||
let execResult;
|
let execResult;
|
||||||
// determine if we fail
|
// determine if we fail
|
||||||
@@ -69,12 +68,10 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
|
|||||||
}
|
}
|
||||||
if (!process.env.NPMTS_TEST) {
|
if (!process.env.NPMTS_TEST) {
|
||||||
for (let i = 0; i <= retryArg; i++) {
|
for (let i = 0; i <= retryArg; i++) {
|
||||||
if (!bareArg) {
|
if (process.env.DEBUG_NPMCI === 'true') {
|
||||||
execResult = yield npmciSmartshell.exec(commandArg);
|
console.log(commandArg);
|
||||||
}
|
|
||||||
else {
|
|
||||||
execResult = yield plugins.smartshell.exec(commandArg);
|
|
||||||
}
|
}
|
||||||
|
execResult = yield npmciSmartshell.exec(commandArg);
|
||||||
// determine how bash reacts to error and success
|
// determine how bash reacts to error and success
|
||||||
if (execResult.exitCode !== 0 && i === retryArg) {
|
if (execResult.exitCode !== 0 && i === retryArg) {
|
||||||
if (failOnError) {
|
if (failOnError) {
|
||||||
@@ -101,16 +98,10 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo
|
|||||||
}
|
}
|
||||||
return execResult.stdout;
|
return execResult.stdout;
|
||||||
});
|
});
|
||||||
/**
|
|
||||||
* bashBare allows usage of bash without sourcing any files like nvm
|
|
||||||
*/
|
|
||||||
exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, function* () {
|
|
||||||
return yield exports.bash(commandArg, retryArg, true);
|
|
||||||
});
|
|
||||||
/**
|
/**
|
||||||
* bashNoError allows executing stuff without throwing an error
|
* bashNoError allows executing stuff without throwing an error
|
||||||
*/
|
*/
|
||||||
exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
|
exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () {
|
||||||
return yield exports.bash(commandArg, -1);
|
return yield exports.bash(commandArg, -1);
|
||||||
});
|
});
|
||||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSx1QkFBdUIsQ0FBRSxDQUFDLENBQUE7WUFDM0Qsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSxlQUFlLENBQUUsQ0FBQyxDQUFBO1lBQ25ELG9CQUFZ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
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyx1Q0FBc0M7QUFFdEMsaUNBQWdDO0FBRWhDOztHQUVHO0FBQ1EsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssRUFBVyxDQUFBO0FBQ3RDLFFBQUEsYUFBYSxHQUFHLE1BQU0sQ0FBQyxLQUFLLEVBQVcsQ0FBQTtBQUNsRDs7R0FFRztBQUNILElBQUksZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDdEQsUUFBUSxFQUFFLE1BQU07SUFDaEIsZUFBZSxFQUFFLEVBQUU7Q0FDcEIsQ0FBQyxDQUFBO0FBRUY7O0dBRUc7QUFDSCxJQUFJLG1CQUFtQixHQUFHO0lBQ3hCLGdCQUFnQjtJQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FDRCxDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsd0NBQXdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUMvRixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSx1QkFBdUIsQ0FBRSxDQUFDLENBQUE7WUFDM0Qsb0JBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FDUixDQUFDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsZ0NBQWdDLENBQUMsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUN2RixDQUFDLENBQUMsQ0FBQztZQUNELGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBRSxlQUFlLENBQUUsQ0FBQyxDQUFBO1lBQ25ELG9CQUFZ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
|
||||||
36
dist/npmci.build.docker.js
vendored
36
dist/npmci.build.docker.js
vendored
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "npmci",
|
"name": "npmci",
|
||||||
"version": "2.3.62",
|
"version": "2.3.64",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"typings": "dist/index.d.ts",
|
"typings": "dist/index.d.ts",
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ let checkToolsAvailable = async () => {
|
|||||||
nvmAvailable.resolve(true)
|
nvmAvailable.resolve(true)
|
||||||
} else {
|
} else {
|
||||||
nvmAvailable.resolve(false)
|
nvmAvailable.resolve(false)
|
||||||
};
|
}
|
||||||
|
|
||||||
// check for yarn
|
// check for yarn
|
||||||
await plugins.smartshell.which('yarn').then(
|
await plugins.smartshell.which('yarn').then(
|
||||||
@@ -56,7 +56,7 @@ checkToolsAvailable()
|
|||||||
* @param commandArg - The command to execute
|
* @param commandArg - The command to execute
|
||||||
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
* @param retryArg - The retryArg: 0 to any positive number will retry, -1 will always succeed, -2 will return undefined
|
||||||
*/
|
*/
|
||||||
export let bash = async (commandArg: string, retryArg: number = 2, bareArg: boolean = false): Promise<string> => {
|
export let bash = async (commandArg: string, retryArg: number = 2): Promise<string> => {
|
||||||
await nvmAvailable.promise // make sure nvm check has run
|
await nvmAvailable.promise // make sure nvm check has run
|
||||||
let execResult: plugins.smartshell.IExecResult
|
let execResult: plugins.smartshell.IExecResult
|
||||||
|
|
||||||
@@ -69,11 +69,10 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
|
|||||||
|
|
||||||
if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
|
if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
|
||||||
for (let i = 0; i <= retryArg; i++) {
|
for (let i = 0; i <= retryArg; i++) {
|
||||||
if (!bareArg) {
|
if (process.env.DEBUG_NPMCI === 'true') {
|
||||||
execResult = await npmciSmartshell.exec(commandArg)
|
console.log(commandArg)
|
||||||
} else {
|
|
||||||
execResult = await plugins.smartshell.exec(commandArg)
|
|
||||||
}
|
}
|
||||||
|
execResult = await npmciSmartshell.exec(commandArg)
|
||||||
|
|
||||||
// determine how bash reacts to error and success
|
// determine how bash reacts to error and success
|
||||||
if (execResult.exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
|
if (execResult.exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
|
||||||
@@ -99,13 +98,6 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool
|
|||||||
return execResult.stdout
|
return execResult.stdout
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* bashBare allows usage of bash without sourcing any files like nvm
|
|
||||||
*/
|
|
||||||
export let bashBare = async (commandArg: string, retryArg: number = 2): Promise<string> => {
|
|
||||||
return await bash(commandArg, retryArg, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bashNoError allows executing stuff without throwing an error
|
* bashNoError allows executing stuff without throwing an error
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as plugins from './npmci.plugins'
|
import * as plugins from './npmci.plugins'
|
||||||
import * as paths from './npmci.paths'
|
import * as paths from './npmci.paths'
|
||||||
import * as NpmciEnv from './npmci.env'
|
import * as NpmciEnv from './npmci.env'
|
||||||
import { bashBare } from './npmci.bash'
|
import { bash } from './npmci.bash'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* builds a cwd of Dockerfiles by triggering a promisechain
|
* builds a cwd of Dockerfiles by triggering a promisechain
|
||||||
@@ -28,7 +28,7 @@ export let readDockerfiles = async (): Promise<Dockerfile[]> => {
|
|||||||
console.log(fileTree)
|
console.log(fileTree)
|
||||||
for (let dockerfilePath of fileTree) {
|
for (let dockerfilePath of fileTree) {
|
||||||
let myDockerfile = new Dockerfile({
|
let myDockerfile = new Dockerfile({
|
||||||
filePath: plugins.path.join(paths.cwd, dockerfilePath),
|
filePath: dockerfilePath,
|
||||||
read: true
|
read: true
|
||||||
})
|
})
|
||||||
readDockerfilesArray.push(myDockerfile)
|
readDockerfilesArray.push(myDockerfile)
|
||||||
@@ -167,7 +167,7 @@ export class Dockerfile {
|
|||||||
async build () {
|
async build () {
|
||||||
plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
|
plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
|
||||||
let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
|
let buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} .`
|
||||||
await bashBare(buildCommand)
|
await bash(buildCommand)
|
||||||
NpmciEnv.dockerFilesBuilt.push(this)
|
NpmciEnv.dockerFilesBuilt.push(this)
|
||||||
return
|
return
|
||||||
};
|
};
|
||||||
@@ -178,19 +178,19 @@ export class Dockerfile {
|
|||||||
async push(stageArg) {
|
async push(stageArg) {
|
||||||
switch (stageArg) {
|
switch (stageArg) {
|
||||||
case 'release':
|
case 'release':
|
||||||
await bashBare(`docker tag ${this.buildTag} ${this.releaseTag}`)
|
await bash(`docker tag ${this.buildTag} ${this.releaseTag}`)
|
||||||
await bashBare(`docker push ${this.releaseTag}`)
|
await bash(`docker push ${this.releaseTag}`)
|
||||||
|
|
||||||
// if release registry is different from gitlab
|
// if release registry is different from gitlab
|
||||||
if (NpmciEnv.dockerRegistry !== 'registry.gitlab.com') {
|
if (NpmciEnv.dockerRegistry !== 'registry.gitlab.com') {
|
||||||
await bashBare(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`)
|
await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`)
|
||||||
await bashBare(`docker push ${this.gitlabReleaseTag}`)
|
await bash(`docker push ${this.gitlabReleaseTag}`)
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
case 'test':
|
case 'test':
|
||||||
default:
|
default:
|
||||||
await bashBare(`docker tag ${this.buildTag} ${this.gitlabTestTag}`)
|
await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`)
|
||||||
await bashBare(`docker push ${this.gitlabTestTag}`)
|
await bash(`docker push ${this.gitlabTestTag}`)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -200,8 +200,8 @@ export class Dockerfile {
|
|||||||
*/
|
*/
|
||||||
async pull(registryArg: string) {
|
async pull(registryArg: string) {
|
||||||
let pullTag = this.gitlabTestTag
|
let pullTag = this.gitlabTestTag
|
||||||
await bashBare('docker pull ' + pullTag)
|
await bash('docker pull ' + pullTag)
|
||||||
await bashBare('docker tag ' + pullTag + ' ' + this.buildTag)
|
await bash('docker tag ' + pullTag + ' ' + this.buildTag)
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -212,12 +212,12 @@ export class Dockerfile {
|
|||||||
let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
|
let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
|
||||||
if (testFileExists) {
|
if (testFileExists) {
|
||||||
// run tests
|
// run tests
|
||||||
await bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
|
await bash('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
|
||||||
await bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
|
await bash('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
|
||||||
await bashBare('docker commit npmci_test_container npmci_test_image')
|
await bash('docker commit npmci_test_container npmci_test_image')
|
||||||
await bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
|
await bash('docker run npmci_test_image sh /npmci_test/test.sh')
|
||||||
await bashBare('docker rm npmci_test_container')
|
await bash('docker rm npmci_test_container')
|
||||||
await bashBare('docker rmi --force npmci_test_image')
|
await bash('docker rmi --force npmci_test_image')
|
||||||
} else {
|
} else {
|
||||||
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
|
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
|
||||||
}
|
}
|
||||||
@@ -227,7 +227,7 @@ export class Dockerfile {
|
|||||||
* gets the id of a Dockerfile
|
* gets the id of a Dockerfile
|
||||||
*/
|
*/
|
||||||
async getId() {
|
async getId() {
|
||||||
let containerId = await bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
|
let containerId = await bash('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
|
||||||
return containerId
|
return containerId
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user