now has working dockerBuildArgEnvMap
This commit is contained in:
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -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)
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
import 'typings-global'
|
||||
export import beautylog = require('beautylog')
|
||||
export let gulp = require('gulp')
|
||||
export import gulpFunction = require('gulp-function')
|
||||
|
Reference in New Issue
Block a user