now has working dockerBuildArgEnvMap

This commit is contained in:
2017-08-29 06:07:13 +02:00
parent 37b3c1abc9
commit c247cc2892
8 changed files with 16 additions and 11 deletions

View File

@ -156,11 +156,12 @@ export let getDockerTagString = (registryArg: string, repoArg: string, versionAr
export let getDockerBuildArgs = async (): Promise<string> => {
plugins.beautylog.info('checking for env vars to be supplied to the docker build')
let buildArgsString: string = ''
for (let key in NpmciConfig.configObject.dockerEnvBuildargMap) {
// TODO
for (let key in NpmciConfig.configObject.dockerBuildargEnvMap) {
let targetValue = process.env[NpmciConfig.configObject.dockerBuildargEnvMap[key]]
buildArgsString = `${buildArgsString} --build-arg ${key}=${targetValue}`
}
return buildArgsString
}
}
/**
*

View File

@ -10,7 +10,7 @@ import { KeyValueStore } from 'npmextra'
export interface INpmciOptions {
npmGlobalTools: string[]
dockerRegistryRepoMap: any
dockerEnvBuildargMap: any
dockerBuildargEnvMap: any
}
// instantiate a kvStorage for the current directory
@ -21,7 +21,7 @@ let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
let defaultConfig: INpmciOptions = {
npmGlobalTools: [],
dockerRegistryRepoMap: {},
dockerEnvBuildargMap: {}
dockerBuildargEnvMap: {}
}
export let configObject = npmciNpmextra.dataFor<INpmciOptions>('npmci', defaultConfig)

View File

@ -1,3 +1,4 @@
import 'typings-global'
export import beautylog = require('beautylog')
export let gulp = require('gulp')
export import gulpFunction = require('gulp-function')