diff --git a/package.json b/package.json index 53c6b8a..0f99214 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "dependencies": { "beautylog": "^5.0.8", "commander": "^2.9.0", + "gulp": "^3.9.1", "q": "^1.4.1", "request": "^2.72.0", "shelljs": "^0.7.0", diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index 2130a42..8f2e1d8 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -1,10 +1,11 @@ import * as plugins from "./npmci.plugins" import * as env from "./npmci.env"; -import {tagDocker} from ".npmci.tag"; +import {tagDocker} from "./npmci.tag.docker"; export let build = function(){ let done = plugins.q.defer(); done.resolve(); return done.promise; } -let getDockerFiles = function(){}; \ No newline at end of file + + diff --git a/ts/npmci.plugins.ts b/ts/npmci.plugins.ts index 4694147..986dc1d 100644 --- a/ts/npmci.plugins.ts +++ b/ts/npmci.plugins.ts @@ -1,6 +1,7 @@ import "typings-global"; export import beautylog = require("beautylog"); export let commander = require("commander"); +export let gulp = require("gulp"); export let q = require("q"); export let request = require("request"); export let shelljs = require("shelljs"); diff --git a/ts/npmci.tag.docker.ts b/ts/npmci.tag.docker.ts index 9874e36..def7a09 100644 --- a/ts/npmci.tag.docker.ts +++ b/ts/npmci.tag.docker.ts @@ -1,6 +1,6 @@ import "typings-global"; import * as plugins from "./npmci.plugins"; -import * as env from "./npmci.env"; +import * as NpmciEnv from "./npmci.env"; export let dockerTagVersion = function(){ if(process.env.CI_BUILD_STAGE == "test"){ return "test"; @@ -9,14 +9,14 @@ export let dockerTagVersion = function(){ } } -export let dockerTag = function(){ - return dockerRegistry + "/" + repo.user + "/" + repo.repo + ":" + dockerTagVersion() +" ."; +export let tagDocker = function(){ + return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":" + dockerTagVersion() +" ."; } export let dockerTagTest = function(){ - return dockerRegistry + "/" + repo.user + "/" + repo.repo + ":test ."; + return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":test ."; } export let dockerTagRelease = function(){ - return dockerRegistry + "/" + repo.user + "/" + repo.repo + ":latest ."; + return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":latest ."; } \ No newline at end of file