now has working dockerBuildArgEnvMap
This commit is contained in:
parent
37b3c1abc9
commit
c247cc2892
7
dist/mod_docker/mod.helpers.js
vendored
7
dist/mod_docker/mod.helpers.js
vendored
File diff suppressed because one or more lines are too long
2
dist/npmci.config.d.ts
vendored
2
dist/npmci.config.d.ts
vendored
@ -2,7 +2,7 @@ import { KeyValueStore } from 'npmextra';
|
||||
export interface INpmciOptions {
|
||||
npmGlobalTools: string[];
|
||||
dockerRegistryRepoMap: any;
|
||||
dockerEnvBuildargMap: any;
|
||||
dockerBuildargEnvMap: any;
|
||||
}
|
||||
export declare let kvStorage: KeyValueStore;
|
||||
export declare let configObject: INpmciOptions;
|
||||
|
2
dist/npmci.config.js
vendored
2
dist/npmci.config.js
vendored
@ -19,7 +19,7 @@ let npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
|
||||
let defaultConfig = {
|
||||
npmGlobalTools: [],
|
||||
dockerRegistryRepoMap: {},
|
||||
dockerEnvBuildargMap: {}
|
||||
dockerBuildargEnvMap: {}
|
||||
};
|
||||
exports.configObject = npmciNpmextra.dataFor('npmci', defaultConfig);
|
||||
exports.getConfig = () => __awaiter(this, void 0, void 0, function* () {
|
||||
|
1
dist/npmci.plugins.d.ts
vendored
1
dist/npmci.plugins.d.ts
vendored
@ -1,3 +1,4 @@
|
||||
import 'typings-global';
|
||||
export import beautylog = require('beautylog');
|
||||
export declare let gulp: any;
|
||||
export import gulpFunction = require('gulp-function');
|
||||
|
3
dist/npmci.plugins.js
vendored
3
dist/npmci.plugins.js
vendored
@ -1,5 +1,6 @@
|
||||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
require("typings-global");
|
||||
exports.beautylog = require("beautylog");
|
||||
exports.gulp = require('gulp');
|
||||
exports.gulpFunction = require("gulp-function");
|
||||
@ -22,4 +23,4 @@ exports.smartsystem = require("smartsystem");
|
||||
exports.smartssh = require("smartssh");
|
||||
exports.smartstring = require("smartstring");
|
||||
exports.through2 = require("through2");
|
||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUNyRCxtQ0FBd0M7QUFDeEMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsK0NBQW9EO0FBQ3BELDJDQUFnRDtBQUNoRCxtQ0FBd0M7QUFDeEMsMkNBQWdEO0FBQ2hELDZDQUFrRDtBQUNsRCw2Q0FBa0Q7QUFDbEQsdUNBQTRDO0FBQzVDLDZDQUFrRDtBQUNsRCx1Q0FBNEMifQ==
|
||||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwQkFBdUI7QUFDdkIseUNBQThDO0FBQ25DLFFBQUEsSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtBQUNqQyxnREFBcUQ7QUFDckQsbUNBQXdDO0FBQ3hDLHVDQUE0QztBQUM1QywrQkFBb0M7QUFDcEMsNkNBQWtEO0FBQ2xELDhCQUFtQztBQUN4QixRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDdkMsdUNBQTRDO0FBQzVDLDJDQUFnRDtBQUNoRCx5Q0FBOEM7QUFDOUMscUNBQTBDO0FBQzFDLCtDQUFvRDtBQUNwRCwyQ0FBZ0Q7QUFDaEQsbUNBQXdDO0FBQ3hDLDJDQUFnRDtBQUNoRCw2Q0FBa0Q7QUFDbEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0=
|
@ -156,8 +156,9 @@ 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')
|
||||
|
Loading…
Reference in New Issue
Block a user