From dd142856d0b6e61762bbbf4aac9c779cad697412 Mon Sep 17 00:00:00 2001
From: Phil Kunz <github@philkunz.com>
Date: Sun, 5 Jun 2016 01:31:21 +0200
Subject: [PATCH] restructure

---
 ts/npmci.build.docker.ts | 36 ++++++++++++++++++++++++++++++++++--
 ts/npmci.env.ts          |  4 +++-
 ts/npmci.tag.docker.ts   | 22 ----------------------
 3 files changed, 37 insertions(+), 25 deletions(-)
 delete mode 100644 ts/npmci.tag.docker.ts

diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts
index 8f2e1d8..3f5172f 100644
--- a/ts/npmci.build.docker.ts
+++ b/ts/npmci.build.docker.ts
@@ -1,6 +1,7 @@
 import * as plugins from "./npmci.plugins"
-import * as env from "./npmci.env";
-import {tagDocker} from "./npmci.tag.docker";
+import * as NpmciEnv from "./npmci.env";
+
+
 export let build = function(){
     let done = plugins.q.defer();
     done.resolve();
@@ -8,4 +9,35 @@ export let build = function(){
 }
 
 
+class Dockerfile {
+    repo:string;
+    version:string;
+    baseImage:string;
+    constructor(){
+        
+    };
+    build(){
+        
+    };
+    
+}
 
+export let dockerTagVersion = function(){
+    if(process.env.CI_BUILD_STAGE == "test"){
+        return "test";
+    } else {
+        return "latest"
+    }
+}
+
+export let tagDocker = function(){
+    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":" + dockerTagVersion() +" .";
+}
+
+export let dockerTagTest = function(){
+    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":test .";
+}
+
+export let dockerTagRelease = function(){
+    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":latest .";
+}
diff --git a/ts/npmci.env.ts b/ts/npmci.env.ts
index f3f0c44..bcc9ff6 100644
--- a/ts/npmci.env.ts
+++ b/ts/npmci.env.ts
@@ -7,4 +7,6 @@ export let repo = new GitRepo(process.env.CI_BUILD_REPO);
 export let dockerTestTag:string;
 export let dockerReleaseTag:string;
 
-export let dockerRegistry = "docker.io"; // will be set by npmci.prepare
\ No newline at end of file
+export let dockerRegistry; // will be set by npmci.prepare
+export let dockerImages;
+export let dockerFiles;
\ No newline at end of file
diff --git a/ts/npmci.tag.docker.ts b/ts/npmci.tag.docker.ts
deleted file mode 100644
index def7a09..0000000
--- a/ts/npmci.tag.docker.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import "typings-global";
-import * as plugins from "./npmci.plugins";
-import * as NpmciEnv from "./npmci.env";
-export let dockerTagVersion = function(){
-    if(process.env.CI_BUILD_STAGE == "test"){
-        return "test";
-    } else {
-        return "latest"
-    }
-}
-
-export let tagDocker = function(){
-    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":" + dockerTagVersion() +" .";
-}
-
-export let dockerTagTest = function(){
-    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":test .";
-}
-
-export let dockerTagRelease = function(){
-    return NpmciEnv.dockerRegistry + "/" + NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo + ":latest .";
-}
\ No newline at end of file