fix some config issues and update to latest smartssh

This commit is contained in:
2016-06-26 04:40:58 +02:00
parent b59bf2de8d
commit f091fb2452
7 changed files with 28 additions and 20 deletions

View File

@ -13,14 +13,14 @@ export let buildStage:string = process.env.CI_BUILD_STAGE;
export let dockerRegistry; // will be set by npmci.prepare
export let dockerFilesBuilt:Dockerfile[] = [];
export let dockerFiles:Dockerfile[] = [];
export let config;
export let config = {
dockerRegistry: dockerRegistry,
dockerFilesBuilt: dockerFilesBuilt,
dockerFiles: dockerFiles,
project: undefined
};
export let configStore = () => {
let config = {
dockerRegistry: dockerRegistry,
dockerFilesBuilt: dockerFilesBuilt,
dockerFiles: dockerFiles
}
plugins.smartfile.memory.toFsSync(
JSON.stringify(config),
paths.NpmciPackageConfig
@ -30,10 +30,9 @@ export let configStore = () => {
let configLoad = () => {
// internal config to transfer information in between npmci shell calls
try {
config = plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig,"json");
plugins.lodash.assign(config,plugins.smartfile.fs.toObjectSync(paths.NpmciPackageConfig,"json"));
}
catch(err){
config = {};
configStore();
plugins.beautylog.log("config initialized!");
}

View File

@ -2,6 +2,7 @@ import "typings-global";
export import beautylog = require("beautylog");
export let gulp = require("gulp");
export let gulpFunction = require("gulp-function");
export let lodash = require("lodash");
export import path = require("path");
export import projectinfo = require("projectinfo");
export let q = require("q");