Merge branch 'master' into 'master'
Go fully async with shelljs to reduce processor strain Closes #2 See merge request !2
This commit is contained in:
Phil Kunz
commit
bbc2e9002a
@ -30,7 +30,6 @@
|
||||
"dependencies": {
|
||||
"@types/lodash": "^4.14.52",
|
||||
"@types/node": "^7.0.5",
|
||||
"@types/q": "0.x.x",
|
||||
"@types/request": "0.x.x",
|
||||
"@types/shelljs": "^0.7.0",
|
||||
"@types/through2": "^2.0.32",
|
||||
@ -40,7 +39,6 @@
|
||||
"lodash": "^4.17.4",
|
||||
"npmextra": "^2.0.3",
|
||||
"projectinfo": "^3.0.1",
|
||||
"q": "^1.4.1",
|
||||
"request": "^2.79.0",
|
||||
"shelljs": "^0.7.6",
|
||||
"smartcli": "^2.0.1",
|
||||
|
||||
@ -19,7 +19,7 @@ checkNvm()
|
||||
* @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
|
||||
*/
|
||||
export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean = false): string => {
|
||||
export let bash = async (commandArg: string, retryArg: number = 2, bareArg: boolean = false): Promise<string> => {
|
||||
let exitCode: number
|
||||
let stdOut: string
|
||||
let execResult
|
||||
@ -43,6 +43,7 @@ export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean =
|
||||
// determine how bash reacts to error and success
|
||||
if (exitCode !== 0 && i === retryArg) { // something went wrong and retries are exhausted
|
||||
if (failOnError) {
|
||||
plugins.beautylog.error('something went wrong and retries are exhausted')
|
||||
process.exit(1)
|
||||
}
|
||||
} else if (exitCode === 0) { // everything went fine, or no error wanted
|
||||
@ -55,19 +56,18 @@ export let bash = (commandArg: string, retryArg: number = 2, bareArg: boolean =
|
||||
} else {
|
||||
plugins.beautylog.log('ShellExec would be: ' + commandArg)
|
||||
}
|
||||
return stdOut
|
||||
}
|
||||
|
||||
/**
|
||||
* bashBare allows usage of bash without sourcing any files like nvm
|
||||
*/
|
||||
export let bashBare = (commandArg: string, retryArg: number = 2) => {
|
||||
export let bashBare = (commandArg: string, retryArg: number = 2): Promise<string> => {
|
||||
return bash(commandArg, retryArg, true)
|
||||
}
|
||||
|
||||
/**
|
||||
* bashNoError allows executing stuff without throwing an error
|
||||
*/
|
||||
export let bashNoError = (commandArg: string): string => {
|
||||
export let bashNoError = (commandArg: string): Promise<string> => {
|
||||
return bash(commandArg, -1)
|
||||
}
|
||||
|
||||
@ -1,43 +1,38 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import * as paths from './npmci.paths'
|
||||
import * as NpmciEnv from './npmci.env'
|
||||
import {bashBare} from './npmci.bash'
|
||||
import { bashBare } from './npmci.bash'
|
||||
|
||||
/**
|
||||
* builds a cwd of Dockerfiles by triggering a promisechain
|
||||
*/
|
||||
export let build = function(){
|
||||
let done = plugins.q.defer()
|
||||
readDockerfiles()
|
||||
.then(sortDockerfiles)
|
||||
.then(mapDockerfiles)
|
||||
.then(buildDockerfiles)
|
||||
.then(pushDockerfiles)
|
||||
.then(() => {
|
||||
done.resolve()
|
||||
})
|
||||
return done.promise
|
||||
export let build = async () => {
|
||||
await readDockerfiles()
|
||||
.then(sortDockerfiles)
|
||||
.then(mapDockerfiles)
|
||||
.then(buildDockerfiles)
|
||||
.then(pushDockerfiles)
|
||||
}
|
||||
|
||||
/**
|
||||
* creates instance of class Dockerfile for all Dockerfiles in cwd
|
||||
* @returns Promise<Dockerfile[]>
|
||||
*/
|
||||
export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
|
||||
let done = plugins.q.defer<Dockerfile[]>()
|
||||
let readDockerfilesArray: Dockerfile[] = []
|
||||
plugins.gulp.src('./Dockerfile*')
|
||||
.pipe(plugins.through2.obj(function(file,enc,cb){
|
||||
let myDockerfile = new Dockerfile({
|
||||
filePath: file.path,
|
||||
read: true
|
||||
})
|
||||
readDockerfilesArray.push(myDockerfile)
|
||||
cb(null,file)
|
||||
},function(){
|
||||
done.resolve(readDockerfilesArray)
|
||||
}))
|
||||
return done.promise
|
||||
export let readDockerfiles = async (): Promise<Dockerfile[]> => {
|
||||
let fileTree = await plugins.smartfile.fs.listFileTree(paths.cwd, './Dockerfile*')
|
||||
|
||||
// create the Dockerfile array
|
||||
let readDockerfilesArray: Dockerfile[] = []
|
||||
for (let dockerfilePath of fileTree) {
|
||||
let myDockerfile = new Dockerfile({
|
||||
filePath: dockerfilePath,
|
||||
read: true
|
||||
})
|
||||
readDockerfilesArray.push(myDockerfile)
|
||||
}
|
||||
|
||||
return readDockerfilesArray
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -45,249 +40,235 @@ export let readDockerfiles = function(): plugins.q.Promise<Dockerfile[]>{
|
||||
* @param sortableArrayArg an array of instances of class Dockerfile
|
||||
* @returns Promise<Dockerfile[]>
|
||||
*/
|
||||
export let sortDockerfiles = function(sortableArrayArg: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
|
||||
let done = plugins.q.defer<Dockerfile[]>()
|
||||
let sortedArray: Dockerfile[] = []
|
||||
let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray)
|
||||
let sorterFunctionCounter: number = 0
|
||||
let sorterFunction = function(){
|
||||
sortableArrayArg.forEach((dockerfileArg) => {
|
||||
let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray)
|
||||
if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
|
||||
sortedArray.push(dockerfileArg)
|
||||
};
|
||||
if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
|
||||
dockerfileArg.localBaseImageDependent = true
|
||||
};
|
||||
})
|
||||
if (sortableArrayArg.length === sortedArray.length) {
|
||||
done.resolve(sortedArray)
|
||||
} else if (sorterFunctionCounter < 10) {
|
||||
sorterFunctionCounter++
|
||||
sorterFunction()
|
||||
};
|
||||
}
|
||||
sorterFunction()
|
||||
return done.promise
|
||||
export let sortDockerfiles = (sortableArrayArg: Dockerfile[]): plugins.q.Promise<Dockerfile[]> => {
|
||||
let done = plugins.q.defer<Dockerfile[]>()
|
||||
let sortedArray: Dockerfile[] = []
|
||||
let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
|
||||
let sorterFunctionCounter: number = 0
|
||||
let sorterFunction = function () {
|
||||
sortableArrayArg.forEach((dockerfileArg) => {
|
||||
let cleanTags = cleanTagsArrayFunction(sortableArrayArg, sortedArray)
|
||||
if (cleanTags.indexOf(dockerfileArg.baseImage) === -1 && sortedArray.indexOf(dockerfileArg) === -1) {
|
||||
sortedArray.push(dockerfileArg)
|
||||
};
|
||||
if (cleanTagsOriginal.indexOf(dockerfileArg.baseImage) !== -1) {
|
||||
dockerfileArg.localBaseImageDependent = true
|
||||
};
|
||||
})
|
||||
if (sortableArrayArg.length === sortedArray.length) {
|
||||
done.resolve(sortedArray)
|
||||
} else if (sorterFunctionCounter < 10) {
|
||||
sorterFunctionCounter++
|
||||
sorterFunction()
|
||||
};
|
||||
}
|
||||
sorterFunction()
|
||||
return done.promise
|
||||
}
|
||||
|
||||
/**
|
||||
* maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
|
||||
*/
|
||||
export let mapDockerfiles = function(sortedArray: Dockerfile[]): plugins.q.Promise<Dockerfile[]>{
|
||||
let done = plugins.q.defer<Dockerfile[]>()
|
||||
sortedArray.forEach((dockerfileArg) => {
|
||||
if (dockerfileArg.localBaseImageDependent) {
|
||||
sortedArray.forEach((dockfile2: Dockerfile) => {
|
||||
if (dockfile2.cleanTag === dockerfileArg.baseImage) {
|
||||
dockerfileArg.localBaseDockerfile = dockfile2
|
||||
}
|
||||
})
|
||||
};
|
||||
})
|
||||
done.resolve(sortedArray)
|
||||
return done.promise
|
||||
export let mapDockerfiles = async (sortedArray: Dockerfile[]): plugins.q.Promise<Dockerfile[]> => {
|
||||
sortedArray.forEach((dockerfileArg) => {
|
||||
if (dockerfileArg.localBaseImageDependent) {
|
||||
sortedArray.forEach((dockfile2: Dockerfile) => {
|
||||
if (dockfile2.cleanTag === dockerfileArg.baseImage) {
|
||||
dockerfileArg.localBaseDockerfile = dockfile2
|
||||
}
|
||||
})
|
||||
};
|
||||
})
|
||||
return sortedArray
|
||||
}
|
||||
|
||||
/**
|
||||
* builds the correspoding real docker image for each Dockerfile class instance
|
||||
*/
|
||||
export let buildDockerfiles = (sortedArrayArg: Dockerfile[]) => {
|
||||
let done = plugins.q.defer()
|
||||
sortedArrayArg.forEach(function(dockerfileArg){
|
||||
dockerfileArg.build()
|
||||
})
|
||||
done.resolve(sortedArrayArg)
|
||||
return done.promise
|
||||
export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
|
||||
sortedArrayArg.forEach(async function (dockerfileArg) {
|
||||
await dockerfileArg.build()
|
||||
})
|
||||
return sortedArrayArg
|
||||
}
|
||||
|
||||
/**
|
||||
* pushes the real Dockerfile images to a Docker registry
|
||||
*/
|
||||
export let pushDockerfiles = function(sortedArrayArg: Dockerfile[]){
|
||||
let done = plugins.q.defer()
|
||||
sortedArrayArg.forEach(function(dockerfileArg){
|
||||
dockerfileArg.push(NpmciEnv.buildStage)
|
||||
})
|
||||
done.resolve(sortedArrayArg)
|
||||
return done.promise
|
||||
export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
|
||||
sortedArrayArg.forEach(async (dockerfileArg) => {
|
||||
await dockerfileArg.push(NpmciEnv.buildStage)
|
||||
})
|
||||
return sortedArrayArg
|
||||
}
|
||||
|
||||
/**
|
||||
* pulls corresponding real Docker images for instances of Dockerfile from a registry.
|
||||
* This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages.
|
||||
*/
|
||||
export let pullDockerfileImages = (sortableArrayArg: Dockerfile[],registryArg = 'registry.gitlab.com') => {
|
||||
let done = plugins.q.defer()
|
||||
sortableArrayArg.forEach((dockerfileArg) => {
|
||||
dockerfileArg.pull(registryArg)
|
||||
})
|
||||
done.resolve(sortableArrayArg)
|
||||
return done.promise
|
||||
export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => {
|
||||
sortableArrayArg.forEach(async (dockerfileArg) => {
|
||||
await dockerfileArg.pull(registryArg)
|
||||
})
|
||||
return sortableArrayArg
|
||||
}
|
||||
|
||||
/**
|
||||
* tests all Dockerfiles in by calling class Dockerfile.test();
|
||||
* @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd
|
||||
*/
|
||||
export let testDockerfiles = (sortedArrayArg: Dockerfile[]) => {
|
||||
let done = plugins.q.defer()
|
||||
sortedArrayArg.forEach(function(dockerfileArg){
|
||||
dockerfileArg.test()
|
||||
})
|
||||
done.resolve(sortedArrayArg)
|
||||
return done.promise
|
||||
export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => {
|
||||
sortedArrayArg.forEach(async (dockerfileArg) => {
|
||||
await dockerfileArg.test()
|
||||
})
|
||||
return sortedArrayArg
|
||||
}
|
||||
|
||||
/**
|
||||
* class Dockerfile represents a Dockerfile on disk in npmci
|
||||
*/
|
||||
export class Dockerfile {
|
||||
filePath: string
|
||||
repo: string
|
||||
version: string
|
||||
cleanTag: string
|
||||
buildTag: string
|
||||
testTag: string
|
||||
releaseTag: string
|
||||
containerName: string
|
||||
content: string
|
||||
baseImage: string
|
||||
localBaseImageDependent: boolean
|
||||
localBaseDockerfile: Dockerfile
|
||||
constructor(options: {filePath?: string,fileContents?: string|Buffer,read?: boolean}) {
|
||||
this.filePath = options.filePath
|
||||
this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
|
||||
this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
|
||||
this.cleanTag = this.repo + ':' + this.version
|
||||
this.buildTag = this.cleanTag
|
||||
this.testTag = dockerTag('registry.gitlab.com',this.repo,this.version,'test')
|
||||
this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version)
|
||||
this.containerName = 'dockerfile-' + this.version
|
||||
if (options.filePath && options.read) {
|
||||
this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
|
||||
};
|
||||
this.baseImage = dockerBaseImage(this.content)
|
||||
this.localBaseImageDependent = false
|
||||
filePath: string
|
||||
repo: string
|
||||
version: string
|
||||
cleanTag: string
|
||||
buildTag: string
|
||||
testTag: string
|
||||
releaseTag: string
|
||||
containerName: string
|
||||
content: string
|
||||
baseImage: string
|
||||
localBaseImageDependent: boolean
|
||||
localBaseDockerfile: Dockerfile
|
||||
constructor(options: { filePath?: string, fileContents?: string | Buffer, read?: boolean }) {
|
||||
this.filePath = options.filePath
|
||||
this.repo = NpmciEnv.repo.user + '/' + NpmciEnv.repo.repo
|
||||
this.version = dockerFileVersion(plugins.path.parse(options.filePath).base)
|
||||
this.cleanTag = this.repo + ':' + this.version
|
||||
this.buildTag = this.cleanTag
|
||||
this.testTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test')
|
||||
this.releaseTag = dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version)
|
||||
this.containerName = 'dockerfile-' + this.version
|
||||
if (options.filePath && options.read) {
|
||||
this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath))
|
||||
};
|
||||
this.baseImage = dockerBaseImage(this.content)
|
||||
this.localBaseImageDependent = false
|
||||
};
|
||||
|
||||
/**
|
||||
* builds the Dockerfile
|
||||
*/
|
||||
build() {
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
|
||||
bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
|
||||
NpmciEnv.dockerFilesBuilt.push(this)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
};
|
||||
/**
|
||||
* builds the Dockerfile
|
||||
*/
|
||||
async build() {
|
||||
plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag)
|
||||
await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .')
|
||||
NpmciEnv.dockerFilesBuilt.push(this)
|
||||
};
|
||||
|
||||
/**
|
||||
* pushes the Dockerfile to a registry
|
||||
*/
|
||||
push(stageArg) {
|
||||
let done = plugins.q.defer()
|
||||
let pushTag
|
||||
switch (stageArg) {
|
||||
case 'release':
|
||||
pushTag = this.releaseTag
|
||||
break
|
||||
case 'test':
|
||||
default:
|
||||
pushTag = this.testTag
|
||||
break
|
||||
}
|
||||
bashBare('docker tag ' + this.buildTag + ' ' + pushTag)
|
||||
bashBare('docker push ' + pushTag)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
};
|
||||
|
||||
/**
|
||||
* pulls the Dockerfile from a registry
|
||||
*/
|
||||
pull(registryArg: string) {
|
||||
let pullTag = this.testTag
|
||||
bashBare('docker pull ' + pullTag)
|
||||
bashBare('docker tag ' + pullTag + ' ' + this.buildTag)
|
||||
};
|
||||
|
||||
/**
|
||||
* tests the Dockerfile;
|
||||
*/
|
||||
test() {
|
||||
let testFile: string = plugins.path.join(paths.NpmciTestDir,'test_' + this.version + '.sh')
|
||||
let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
|
||||
if (testFileExists) {
|
||||
bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
|
||||
bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
|
||||
bashBare('docker commit npmci_test_container npmci_test_image')
|
||||
bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
|
||||
bashBare('docker rm npmci_test_container')
|
||||
bashBare('docker rmi --force npmci_test_image')
|
||||
} else {
|
||||
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* gets the id of a Dockerfile
|
||||
*/
|
||||
getId() {
|
||||
let containerId = bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
|
||||
return containerId
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export let dockerFileVersion = function(dockerfileNameArg: string): string{
|
||||
let versionString: string
|
||||
let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
|
||||
let regexResultArray = versionRegex.exec(dockerfileNameArg)
|
||||
if (regexResultArray && regexResultArray.length === 2) {
|
||||
versionString = regexResultArray[1]
|
||||
} else {
|
||||
versionString = 'latest'
|
||||
/**
|
||||
* pushes the Dockerfile to a registry
|
||||
*/
|
||||
async push(stageArg) {
|
||||
let pushTag
|
||||
switch (stageArg) {
|
||||
case 'release':
|
||||
pushTag = this.releaseTag
|
||||
break
|
||||
case 'test':
|
||||
default:
|
||||
pushTag = this.testTag
|
||||
break
|
||||
}
|
||||
return versionString
|
||||
await bashBare('docker tag ' + this.buildTag + ' ' + pushTag)
|
||||
await bashBare('docker push ' + pushTag)
|
||||
};
|
||||
|
||||
/**
|
||||
* pulls the Dockerfile from a registry
|
||||
*/
|
||||
async pull(registryArg: string) {
|
||||
let pullTag = this.testTag
|
||||
await bashBare('docker pull ' + pullTag)
|
||||
await bashBare('docker tag ' + pullTag + ' ' + this.buildTag)
|
||||
};
|
||||
|
||||
/**
|
||||
* tests the Dockerfile;
|
||||
*/
|
||||
async test() {
|
||||
let testFile: string = plugins.path.join(paths.NpmciTestDir, 'test_' + this.version + '.sh')
|
||||
let testFileExists: boolean = plugins.smartfile.fs.fileExistsSync(testFile)
|
||||
if (testFileExists) {
|
||||
// run tests
|
||||
await bashBare('docker run --name npmci_test_container ' + this.buildTag + ' mkdir /npmci_test')
|
||||
await bashBare('docker cp ' + testFile + ' npmci_test_container:/npmci_test/test.sh')
|
||||
await bashBare('docker commit npmci_test_container npmci_test_image')
|
||||
await bashBare('docker run npmci_test_image sh /npmci_test/test.sh')
|
||||
await bashBare('docker rm npmci_test_container')
|
||||
await bashBare('docker rmi --force npmci_test_image')
|
||||
} else {
|
||||
plugins.beautylog.warn('skipping tests for ' + this.cleanTag + ' because no testfile was found!')
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* gets the id of a Dockerfile
|
||||
*/
|
||||
async getId() {
|
||||
let containerId = await bashBare('docker inspect --type=image --format=\"{{.Id}}\" ' + this.buildTag)
|
||||
return containerId
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* returns a version for a docker file
|
||||
* @execution SYNC
|
||||
*/
|
||||
export let dockerFileVersion = (dockerfileNameArg: string): string => {
|
||||
let versionString: string
|
||||
let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/
|
||||
let regexResultArray = versionRegex.exec(dockerfileNameArg)
|
||||
if (regexResultArray && regexResultArray.length === 2) {
|
||||
versionString = regexResultArray[1]
|
||||
} else {
|
||||
versionString = 'latest'
|
||||
}
|
||||
return versionString
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export let dockerBaseImage = function(dockerfileContentArg: string){
|
||||
let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
|
||||
let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
|
||||
return regexResultArray[1]
|
||||
export let dockerBaseImage = function (dockerfileContentArg: string) {
|
||||
let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
|
||||
let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
|
||||
return regexResultArray[1]
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export let dockerTag = function(registryArg: string,repoArg: string,versionArg: string,suffixArg?: string): string{
|
||||
let tagString: string
|
||||
let registry = registryArg
|
||||
let repo = repoArg
|
||||
let version = versionArg
|
||||
if (suffixArg) {
|
||||
version = versionArg + '_' + suffixArg
|
||||
};
|
||||
tagString = registry + '/' + repo + ':' + version
|
||||
return tagString
|
||||
export let dockerTag = function (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string): string {
|
||||
let tagString: string
|
||||
let registry = registryArg
|
||||
let repo = repoArg
|
||||
let version = versionArg
|
||||
if (suffixArg) {
|
||||
version = versionArg + '_' + suffixArg
|
||||
};
|
||||
tagString = registry + '/' + repo + ':' + version
|
||||
return tagString
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export let cleanTagsArrayFunction = function(dockerfileArrayArg: Dockerfile[],trackingArrayArg: Dockerfile[]): string[]{
|
||||
let cleanTagsArray: string[] = []
|
||||
dockerfileArrayArg.forEach(function(dockerfileArg){
|
||||
if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
|
||||
cleanTagsArray.push(dockerfileArg.cleanTag)
|
||||
}
|
||||
})
|
||||
return cleanTagsArray
|
||||
export let cleanTagsArrayFunction = function (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]): string[] {
|
||||
let cleanTagsArray: string[] = []
|
||||
dockerfileArrayArg.forEach(function (dockerfileArg) {
|
||||
if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
|
||||
cleanTagsArray.push(dockerfileArg.cleanTag)
|
||||
}
|
||||
})
|
||||
return cleanTagsArray
|
||||
}
|
||||
|
||||
@ -1,22 +1,23 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {bash} from './npmci.bash'
|
||||
import { bash } from './npmci.bash'
|
||||
import * as env from './npmci.env'
|
||||
import * as buildDocker from './npmci.build.docker'
|
||||
|
||||
/**
|
||||
* defines possible build services
|
||||
*/
|
||||
export type TBuildService = 'docker';
|
||||
export type TBuildService = 'docker'
|
||||
|
||||
/**
|
||||
* builds for a specific service
|
||||
*/
|
||||
export let build = function(commandArg): plugins.q.Promise<any> {
|
||||
switch (commandArg) {
|
||||
case 'docker':
|
||||
return buildDocker.build()
|
||||
default:
|
||||
plugins.beautylog.log('build target ' + commandArg + ' not recognised!')
|
||||
};
|
||||
return
|
||||
export let build = async (commandArg): Promise<void> => {
|
||||
switch (commandArg) {
|
||||
case 'docker':
|
||||
await buildDocker.build()
|
||||
break
|
||||
default:
|
||||
plugins.beautylog.log('build target ' + commandArg + ' not recognised!')
|
||||
};
|
||||
return
|
||||
}
|
||||
|
||||
@ -4,9 +4,7 @@ import * as paths from './npmci.paths'
|
||||
/**
|
||||
* cleans npmci config files
|
||||
*/
|
||||
export let clean = () => {
|
||||
let done = plugins.q.defer()
|
||||
plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
export let clean = async (): Promise<void> => {
|
||||
plugins.smartfile.fs.removeSync(paths.NpmciPackageConfig)
|
||||
return
|
||||
}
|
||||
|
||||
@ -1,15 +1,13 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {bash} from './npmci.bash'
|
||||
import { bash } from './npmci.bash'
|
||||
|
||||
export let command = () => {
|
||||
let done = plugins.q.defer()
|
||||
let wrappedCommand: string = ''
|
||||
let argvArray = process.argv
|
||||
for (let i = 3; i < argvArray.length; i++) {
|
||||
wrappedCommand = wrappedCommand + argvArray[i]
|
||||
if (i + 1 !== argvArray.length) { wrappedCommand = wrappedCommand + ' ' }
|
||||
}
|
||||
bash(wrappedCommand)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
export let command = async () => {
|
||||
let wrappedCommand: string = ''
|
||||
let argvArray = process.argv
|
||||
for (let i = 3; i < argvArray.length; i++) {
|
||||
wrappedCommand = wrappedCommand + argvArray[i]
|
||||
if (i + 1 !== argvArray.length) { wrappedCommand = wrappedCommand + ' ' }
|
||||
}
|
||||
await bash(wrappedCommand)
|
||||
return
|
||||
}
|
||||
|
||||
@ -4,16 +4,14 @@ import * as plugins from './npmci.plugins'
|
||||
import * as paths from './npmci.paths'
|
||||
|
||||
export interface INpmciOptions {
|
||||
globalNpmTools: string[]
|
||||
globalNpmTools: string[]
|
||||
}
|
||||
|
||||
export let getConfig = () => {
|
||||
let done = q.defer<INpmciOptions>()
|
||||
let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
|
||||
let defaultConfig: INpmciOptions = {
|
||||
globalNpmTools: []
|
||||
}
|
||||
let npmciConfig = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)
|
||||
done.resolve(npmciConfig)
|
||||
return done.promise
|
||||
export let getConfig = async (): Promise<INpmciOptions> => {
|
||||
let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
|
||||
let defaultConfig: INpmciOptions = {
|
||||
globalNpmTools: []
|
||||
}
|
||||
let npmciConfig = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)
|
||||
return npmciConfig
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import * as paths from './npmci.paths'
|
||||
import {GitRepo} from 'smartstring'
|
||||
import {Dockerfile} from './npmci.build.docker'
|
||||
import { GitRepo } from 'smartstring'
|
||||
import { Dockerfile } from './npmci.build.docker'
|
||||
|
||||
export let repo: GitRepo
|
||||
if (process.env.CI_BUILD_REPO) repo = new GitRepo(process.env.CI_BUILD_REPO)
|
||||
@ -11,48 +11,47 @@ export let buildStage: string = process.env.CI_BUILD_STAGE
|
||||
// handling config between commands
|
||||
export let dockerRegistry: string // will be set by npmci.prepare
|
||||
export let setDockerRegistry = (dockerRegistryArg: string) => {
|
||||
dockerRegistry = dockerRegistryArg
|
||||
dockerRegistry = dockerRegistryArg
|
||||
}
|
||||
export let dockerFilesBuilt: Dockerfile[] = []
|
||||
export let dockerFiles: Dockerfile[] = []
|
||||
export let config = {
|
||||
dockerRegistry: undefined, // this will be set later on store
|
||||
dockerFilesBuilt: dockerFilesBuilt,
|
||||
dockerFiles: dockerFiles,
|
||||
project: undefined
|
||||
dockerRegistry: undefined, // this will be set later on store
|
||||
dockerFilesBuilt: dockerFilesBuilt,
|
||||
dockerFiles: dockerFiles,
|
||||
project: undefined
|
||||
}
|
||||
|
||||
export let configStore = () => {
|
||||
config.dockerRegistry = dockerRegistry
|
||||
plugins.smartfile.memory.toFsSync(
|
||||
JSON.stringify(config),
|
||||
paths.NpmciPackageConfig
|
||||
)
|
||||
config.dockerRegistry = dockerRegistry
|
||||
plugins.smartfile.memory.toFsSync(
|
||||
JSON.stringify(config),
|
||||
paths.NpmciPackageConfig
|
||||
)
|
||||
}
|
||||
|
||||
let configLoad = () => {
|
||||
// internal config to transfer information in between npmci shell calls
|
||||
try {
|
||||
plugins.lodash.assign(config,plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig,'json'))
|
||||
}
|
||||
catch (err) {
|
||||
configStore()
|
||||
plugins.beautylog.log('config initialized!')
|
||||
}
|
||||
// internal config to transfer information in between npmci shell calls
|
||||
try {
|
||||
plugins.lodash.assign(config, plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig, 'json'))
|
||||
} catch (err) {
|
||||
configStore()
|
||||
plugins.beautylog.log('config initialized!')
|
||||
}
|
||||
|
||||
// project config
|
||||
try {
|
||||
if (!config.project) {
|
||||
config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir,'npmci.json')
|
||||
plugins.beautylog.ok('project config found!')
|
||||
};
|
||||
}
|
||||
catch (err) {
|
||||
config.project = {}
|
||||
plugins.beautylog.log('no project config found, so proceeding with default behaviour!')
|
||||
}
|
||||
// project config
|
||||
try {
|
||||
if (!config.project) {
|
||||
config.project = plugins.smartfile.fs.toObjectSync(paths.NpmciProjectDir, 'npmci.json')
|
||||
plugins.beautylog.ok('project config found!')
|
||||
};
|
||||
}
|
||||
catch (err) {
|
||||
config.project = {}
|
||||
plugins.beautylog.log('no project config found, so proceeding with default behaviour!')
|
||||
}
|
||||
|
||||
config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0)
|
||||
config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void(0)
|
||||
config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void (0)
|
||||
config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void (0)
|
||||
}
|
||||
configLoad()
|
||||
|
||||
@ -2,8 +2,12 @@ import * as plugins from './npmci.plugins'
|
||||
import * as configModule from './npmci.config'
|
||||
import { bash, bashNoError } from './npmci.bash'
|
||||
import { nvmAvailable } from './npmci.bash'
|
||||
export let install = (versionArg) => {
|
||||
let done = plugins.q.defer()
|
||||
|
||||
/**
|
||||
* Install a specific version of node
|
||||
* @param versionArg
|
||||
*/
|
||||
export let install = async (versionArg) => {
|
||||
plugins.beautylog.log(`now installing node version ${versionArg}`)
|
||||
let version: string
|
||||
if (versionArg === 'stable') {
|
||||
@ -16,30 +20,28 @@ export let install = (versionArg) => {
|
||||
version = versionArg
|
||||
};
|
||||
if (nvmAvailable) {
|
||||
bash(`nvm install ${version} && nvm alias default ${version}`)
|
||||
await bash(`nvm install ${version} && nvm alias default ${version}`)
|
||||
plugins.beautylog.success(`Node version ${version} successfully installed!`)
|
||||
} else {
|
||||
plugins.beautylog.warn('Nvm not in path so staying at installed node version!')
|
||||
};
|
||||
bash('node -v')
|
||||
bash('npm -v')
|
||||
await bash('node -v')
|
||||
await bash('npm -v')
|
||||
// lets look for further config
|
||||
configModule.getConfig()
|
||||
.then(configArg => {
|
||||
.then(async configArg => {
|
||||
plugins.beautylog.log('Now checking for needed global npm tools...')
|
||||
for (let npmTool of configArg.globalNpmTools) {
|
||||
plugins.beautylog.info(`Checking for global "${npmTool}"`)
|
||||
let whichOutput = bashNoError(`which ${npmTool}`)
|
||||
let whichOutput: string = await bashNoError(`which ${npmTool}`)
|
||||
let toolAvailable: boolean = !((/not\sfound/.test(whichOutput)) || whichOutput === '')
|
||||
if (toolAvailable) {
|
||||
plugins.beautylog.log(`Tool ${npmTool} is available`)
|
||||
} else {
|
||||
plugins.beautylog.info(`globally installing ${npmTool} from npm`)
|
||||
bash(`npm install ${npmTool} -q -g`)
|
||||
await bash(`npm install ${npmTool} -q -g`)
|
||||
}
|
||||
}
|
||||
plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!')
|
||||
done.resolve()
|
||||
})
|
||||
return done.promise
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ export import lodash = require('lodash')
|
||||
export import npmextra = require('npmextra')
|
||||
export import path = require('path')
|
||||
export import projectinfo = require('projectinfo')
|
||||
export import q = require('q')
|
||||
export import q = require('smartq')
|
||||
export let request = require('request')
|
||||
export import shelljs = require('shelljs')
|
||||
export import smartcli = require('smartcli')
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {bash} from './npmci.bash'
|
||||
import { bash } from './npmci.bash'
|
||||
import * as env from './npmci.env'
|
||||
import * as sshModule from './npmci.ssh'
|
||||
|
||||
@ -9,85 +9,74 @@ import * as sshModule from './npmci.ssh'
|
||||
/**
|
||||
* defines possible prepare services
|
||||
*/
|
||||
export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh';
|
||||
export type TPrepService = 'npm' | 'docker' | 'docker-gitlab' | 'ssh'
|
||||
|
||||
/**
|
||||
* authenticates npm with token from env var
|
||||
*/
|
||||
let npm = function(){
|
||||
let done = plugins.q.defer()
|
||||
|
||||
let npmrcPrefix: string = '//registry.npmjs.org/:_authToken='
|
||||
let npmToken: string = process.env.NPMCI_TOKEN_NPM
|
||||
let npmrcFileString = npmrcPrefix + npmToken
|
||||
|
||||
if (npmToken) {
|
||||
plugins.beautylog.info('found access token')
|
||||
} else {
|
||||
plugins.beautylog.error('no access token found! Exiting!')
|
||||
process.exit(1)
|
||||
}
|
||||
plugins.smartfile.memory.toFsSync(npmrcFileString,'/root/.npmrc')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let npm = async () => {
|
||||
let npmrcPrefix: string = '//registry.npmjs.org/:_authToken='
|
||||
let npmToken: string = process.env.NPMCI_TOKEN_NPM
|
||||
let npmrcFileString: string = npmrcPrefix + npmToken
|
||||
if (npmToken) {
|
||||
plugins.beautylog.info('found access token')
|
||||
} else {
|
||||
plugins.beautylog.error('no access token found! Exiting!')
|
||||
process.exit(1)
|
||||
}
|
||||
plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc')
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* logs in docker
|
||||
*/
|
||||
let docker = function(){
|
||||
let done = plugins.q.defer()
|
||||
env.setDockerRegistry('docker.io')
|
||||
let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
|
||||
if (!process.env.NPMCI_LOGIN_DOCKER) {
|
||||
plugins.beautylog.error('You have to specify Login Data to the Docker Registry')
|
||||
process.exit(1)
|
||||
}
|
||||
plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry
|
||||
let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER)
|
||||
let username = dockerRegexResultArray[1]
|
||||
let password = dockerRegexResultArray[2]
|
||||
plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let docker = async () => {
|
||||
env.setDockerRegistry('docker.io')
|
||||
let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
|
||||
if (!process.env.NPMCI_LOGIN_DOCKER) {
|
||||
plugins.beautylog.error('You have to specify Login Data to the Docker Registry')
|
||||
process.exit(1)
|
||||
}
|
||||
plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com') // Always also login to GitLab Registry
|
||||
let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER)
|
||||
let username = dockerRegexResultArray[1]
|
||||
let password = dockerRegexResultArray[2]
|
||||
plugins.shelljs.exec('docker login -u ' + username + ' -p ' + password)
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* prepare docker for gitlab registry
|
||||
*/
|
||||
let dockerGitlab = function(){
|
||||
let done = plugins.q.defer()
|
||||
env.setDockerRegistry('registry.gitlab.com')
|
||||
plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let dockerGitlab = async () => {
|
||||
env.setDockerRegistry('registry.gitlab.com')
|
||||
plugins.shelljs.exec('docker login -u gitlab-ci-token -p ' + process.env.CI_BUILD_TOKEN + ' ' + 'registry.gitlab.com')
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* prepare ssh
|
||||
*/
|
||||
let ssh = function(){
|
||||
let done = plugins.q.defer()
|
||||
sshModule.ssh()
|
||||
.then(done.resolve)
|
||||
return done.promise
|
||||
let ssh = async () => {
|
||||
await sshModule.ssh()
|
||||
}
|
||||
|
||||
/**
|
||||
* the main exported prepare function
|
||||
* @param servieArg describes the service to prepare
|
||||
*/
|
||||
export let prepare = function(serviceArg: TPrepService){
|
||||
switch (serviceArg) {
|
||||
case 'npm':
|
||||
return npm()
|
||||
case 'docker':
|
||||
return docker()
|
||||
case 'docker-gitlab':
|
||||
return dockerGitlab()
|
||||
case 'ssh':
|
||||
return ssh()
|
||||
default:
|
||||
break
|
||||
}
|
||||
export let prepare = async (serviceArg: TPrepService) => {
|
||||
switch (serviceArg) {
|
||||
case 'npm':
|
||||
return await npm()
|
||||
case 'docker':
|
||||
return await docker()
|
||||
case 'docker-gitlab':
|
||||
return await dockerGitlab()
|
||||
case 'ssh':
|
||||
return await ssh()
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,49 +1,46 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {prepare} from './npmci.prepare'
|
||||
import {bash} from './npmci.bash'
|
||||
import { prepare } from './npmci.prepare'
|
||||
import { bash } from './npmci.bash'
|
||||
import * as NpmciEnv from './npmci.env'
|
||||
import * as NpmciBuildDocker from './npmci.build.docker'
|
||||
|
||||
/**
|
||||
* type of supported services
|
||||
*/
|
||||
export type TPubService = 'npm' | 'docker';
|
||||
export type TPubService = 'npm' | 'docker'
|
||||
|
||||
/**
|
||||
* the main exported publish function.
|
||||
* @param pubServiceArg references targeted service to publish to
|
||||
*/
|
||||
export let publish = (pubServiceArg: TPubService = 'npm') => {
|
||||
switch (pubServiceArg) {
|
||||
case 'npm':
|
||||
return publishNpm()
|
||||
case 'docker':
|
||||
return publishDocker()
|
||||
}
|
||||
export let publish = async (pubServiceArg: TPubService = 'npm') => {
|
||||
switch (pubServiceArg) {
|
||||
case 'npm':
|
||||
return await publishNpm()
|
||||
case 'docker':
|
||||
return await publishDocker()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* tries to publish current cwd to NPM registry
|
||||
*/
|
||||
let publishNpm = function(){
|
||||
let done = plugins.q.defer()
|
||||
prepare('npm')
|
||||
.then(function(){
|
||||
bash('npm publish')
|
||||
plugins.beautylog.ok('Done!')
|
||||
done.resolve()
|
||||
})
|
||||
return done.promise
|
||||
let publishNpm = async () => {
|
||||
await prepare('npm')
|
||||
.then(async function () {
|
||||
await bash('npm publish')
|
||||
plugins.beautylog.ok('Done!')
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* tries to pubish current cwd to Docker registry
|
||||
*/
|
||||
let publishDocker = function(){
|
||||
let done = plugins.q.defer()
|
||||
NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.pushDockerfiles)
|
||||
.then(done.resolve)
|
||||
return done.promise
|
||||
let publishDocker = async () => {
|
||||
return await NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.pushDockerfiles)
|
||||
.then(dockerfileArray => {
|
||||
return dockerfileArray
|
||||
})
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ let smartsocketClientConstructorOptions = {
|
||||
/**
|
||||
* the main run function to submit a service to a servezone
|
||||
*/
|
||||
export let run = (configArg) => {
|
||||
export let run = async (configArg) => {
|
||||
new plugins.smartsocket.SmartsocketClient(
|
||||
smartsocketClientConstructorOptions
|
||||
)
|
||||
|
||||
@ -6,45 +6,43 @@ let sshInstance: plugins.smartssh.SshInstance
|
||||
/**
|
||||
* checks for ENV vars in form of NPMCI_SSHKEY_* and deploys any found ones
|
||||
*/
|
||||
export let ssh = () => {
|
||||
let done = plugins.q.defer()
|
||||
sshInstance = new plugins.smartssh.SshInstance() // init ssh instance
|
||||
plugins.smartparam.forEachMinimatch(process.env,'NPMCI_SSHKEY_*',evaluateSshEnv)
|
||||
if (!process.env.NPMTS_TEST) {
|
||||
sshInstance.writeToDisk()
|
||||
} else {
|
||||
plugins.beautylog.log('In test mode, so not storing SSH keys to disk!')
|
||||
};
|
||||
done.resolve()
|
||||
return done.promise
|
||||
export let ssh = async () => {
|
||||
sshInstance = new plugins.smartssh.SshInstance() // init ssh instance
|
||||
plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv)
|
||||
if (!process.env.NPMTS_TEST) {
|
||||
sshInstance.writeToDisk()
|
||||
} else {
|
||||
plugins.beautylog.log('In test mode, so not storing SSH keys to disk!')
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* gets called for each found SSH ENV Var and deploys it
|
||||
*/
|
||||
let evaluateSshEnv = (sshkeyEnvVarArg) => {
|
||||
let resultArray = sshRegex.exec(sshkeyEnvVarArg)
|
||||
let sshKey = new plugins.smartssh.SshKey()
|
||||
plugins.beautylog.info('Found SSH identity for ' + resultArray[1])
|
||||
if (notUndefined(resultArray[1])) {
|
||||
plugins.beautylog.log('---> host defined!')
|
||||
sshKey.host = resultArray[1]
|
||||
}
|
||||
if (notUndefined(resultArray[2])) {
|
||||
plugins.beautylog.log('---> privKey defined!')
|
||||
sshKey.privKeyBase64 = resultArray[2]
|
||||
};
|
||||
if (notUndefined(resultArray[3])) {
|
||||
'---> pubKey defined!'
|
||||
sshKey.pubKeyBase64 = resultArray[3]
|
||||
};
|
||||
let evaluateSshEnv = async (sshkeyEnvVarArg) => {
|
||||
let resultArray = sshRegex.exec(sshkeyEnvVarArg)
|
||||
let sshKey = new plugins.smartssh.SshKey()
|
||||
plugins.beautylog.info('Found SSH identity for ' + resultArray[1])
|
||||
if (notUndefined(resultArray[1])) {
|
||||
plugins.beautylog.log('---> host defined!')
|
||||
sshKey.host = resultArray[1]
|
||||
}
|
||||
if (notUndefined(resultArray[2])) {
|
||||
plugins.beautylog.log('---> privKey defined!')
|
||||
sshKey.privKeyBase64 = resultArray[2]
|
||||
};
|
||||
if (notUndefined(resultArray[3])) {
|
||||
'---> pubKey defined!'
|
||||
sshKey.pubKeyBase64 = resultArray[3]
|
||||
};
|
||||
|
||||
sshInstance.addKey(sshKey)
|
||||
sshInstance.addKey(sshKey)
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* checks if not undefined
|
||||
*/
|
||||
let notUndefined = (stringArg: string) => {
|
||||
return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
|
||||
return (stringArg && stringArg !== 'undefined' && stringArg !== '##')
|
||||
}
|
||||
|
||||
@ -1,49 +1,32 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {bash} from './npmci.bash'
|
||||
import {install} from './npmci.install'
|
||||
import { bash } from './npmci.bash'
|
||||
import { install } from './npmci.install'
|
||||
import * as env from './npmci.env'
|
||||
import * as NpmciBuildDocker from './npmci.build.docker'
|
||||
|
||||
export let test = (versionArg) => {
|
||||
let done = plugins.q.defer()
|
||||
if (versionArg === 'docker') {
|
||||
testDocker()
|
||||
.then(() => {
|
||||
done.resolve()
|
||||
})
|
||||
} else {
|
||||
install(versionArg)
|
||||
.then(npmDependencies)
|
||||
.then(npmTest)
|
||||
.then(() => {
|
||||
done.resolve()
|
||||
})
|
||||
}
|
||||
return done.promise
|
||||
export let test = async (versionArg): Promise<void> => {
|
||||
if (versionArg === 'docker') {
|
||||
await testDocker()
|
||||
} else {
|
||||
await install(versionArg)
|
||||
.then(npmDependencies)
|
||||
.then(npmTest)
|
||||
}
|
||||
}
|
||||
|
||||
let npmDependencies = function(){
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now installing dependencies:')
|
||||
bash('npm install')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let npmDependencies = async ():Promise <void> => {
|
||||
plugins.beautylog.info('now installing dependencies:')
|
||||
await bash('npm install')
|
||||
}
|
||||
|
||||
let npmTest = () => {
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now starting tests:')
|
||||
bash('npm test')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let npmTest = async (): Promise<void> => {
|
||||
plugins.beautylog.info('now starting tests:')
|
||||
await bash('npm test')
|
||||
}
|
||||
|
||||
let testDocker = function(){
|
||||
let done = plugins.q.defer()
|
||||
NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.testDockerfiles)
|
||||
.then(done.resolve)
|
||||
return done.promise
|
||||
let testDocker = async (): Promise<NpmciBuildDocker.Dockerfile[]> => {
|
||||
return await NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.testDockerfiles)
|
||||
}
|
||||
|
||||
|
||||
@ -4,27 +4,24 @@ import { bash } from './npmci.bash'
|
||||
|
||||
let triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/
|
||||
|
||||
export let trigger = function () {
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now running triggers')
|
||||
plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger)
|
||||
done.resolve()
|
||||
return done.promise
|
||||
export let trigger = async () => {
|
||||
plugins.beautylog.info('now running triggers')
|
||||
plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger)
|
||||
}
|
||||
|
||||
let evaluateTrigger = (triggerEnvVarArg) => {
|
||||
let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg)
|
||||
let regexDomain = triggerRegexResultArray[1]
|
||||
let regexProjectId = triggerRegexResultArray[2]
|
||||
let regexProjectTriggerToken = triggerRegexResultArray[3]
|
||||
let regexRefName = triggerRegexResultArray[4]
|
||||
let regexTriggerName
|
||||
if (triggerRegexResultArray.length === 6) {
|
||||
regexTriggerName = triggerRegexResultArray[5]
|
||||
} else {
|
||||
regexTriggerName = 'Unnamed Trigger'
|
||||
}
|
||||
plugins.beautylog.info('Found Trigger!')
|
||||
plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName)
|
||||
plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } })
|
||||
let evaluateTrigger = async (triggerEnvVarArg) => {
|
||||
let triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg)
|
||||
let regexDomain = triggerRegexResultArray[1]
|
||||
let regexProjectId = triggerRegexResultArray[2]
|
||||
let regexProjectTriggerToken = triggerRegexResultArray[3]
|
||||
let regexRefName = triggerRegexResultArray[4]
|
||||
let regexTriggerName
|
||||
if (triggerRegexResultArray.length === 6) {
|
||||
regexTriggerName = triggerRegexResultArray[5]
|
||||
} else {
|
||||
regexTriggerName = 'Unnamed Trigger'
|
||||
}
|
||||
plugins.beautylog.info('Found Trigger!')
|
||||
plugins.beautylog.log('triggering build for ref ' + regexRefName + ' of ' + regexTriggerName)
|
||||
plugins.request.post('https://gitlab.com/api/v3/projects/' + regexProjectId + '/trigger/builds', { form: { token: regexProjectTriggerToken, ref: regexRefName } })
|
||||
}
|
||||
|
||||
@ -1676,7 +1676,7 @@ oauth-sign@~0.8.1:
|
||||
version "0.8.2"
|
||||
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
|
||||
|
||||
object-assign@4.1.0:
|
||||
object-assign@4.1.0, object-assign@^4.0.1:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
|
||||
|
||||
@ -1684,10 +1684,6 @@ object-assign@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
|
||||
|
||||
object-assign@^4.0.1:
|
||||
version "4.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
|
||||
|
||||
object-component@0.0.3:
|
||||
version "0.0.3"
|
||||
resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user