fixes #8

Signed-off-by: Derek Smart <[email protected]>
mcred · Sep 26, 2019 · 94a948b · 94a948b
1 parent 4686be9
commit 94a948b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/main/kotlin/io/titandata/titan/commands/Install.kt b/src/main/kotlin/io/titandata/titan/commands/Install.kt
@@ -7,16 +7,18 @@ package io.titandata.titan.commands
 import io.titandata.titan.Dependencies
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.requireObject
+import com.github.ajalt.clikt.parameters.options.option
 import org.kodein.di.Kodein
 import org.kodein.di.generic.bind
 import org.kodein.di.generic.inSet
 import org.kodein.di.generic.provider
 
 class Install : CliktCommand(help = "Install titan infrastructure") {
     private val dependencies: Dependencies by requireObject()
+    private val registry by option("-r","--registry", help = "Registry URL for titan docker image, defaults to titandata")
     override fun run() {
         val provider = dependencies.provider
-        provider.install()
+        provider.install(registry)
     }
 }
 

diff --git a/src/main/kotlin/io/titandata/titan/providers/Local.kt b/src/main/kotlin/io/titandata/titan/providers/Local.kt
@@ -68,8 +68,13 @@ class Local: Provider {
         return checkInstallCommand.checkInstall()
     }
 
-    override fun install() {
-        val installCommand = Install(titanServerVersion, dockerRegistryUrl, commandExecutor, docker)
+    override fun install(registry: String?) {
+        val regVal = if (registry.isNullOrEmpty()) {
+            dockerRegistryUrl
+        } else {
+            registry
+        }
+        val installCommand = Install(titanServerVersion, regVal, commandExecutor, docker)
         return installCommand.install()
     }
 

diff --git a/src/main/kotlin/io/titandata/titan/providers/Mock.kt b/src/main/kotlin/io/titandata/titan/providers/Mock.kt
@@ -17,7 +17,7 @@ class Mock: Provider {
         println("Committing new state")
     }
 
-    override fun install() {
+    override fun install(registry: String?) {
         println("Initializing new repository")
     }
 

diff --git a/src/main/kotlin/io/titandata/titan/providers/Provider.kt b/src/main/kotlin/io/titandata/titan/providers/Provider.kt
@@ -5,7 +5,7 @@ interface Provider {
     fun pull(container: String, commit: String?, remoteName: String?)
     fun push(container: String, commit: String?, remoteName: String?)
     fun commit(container: String, message: String)
-    fun install()
+    fun install(registry: String?)
     fun abort(container: String)
     fun status(container: String)
     fun remoteAdd(container: String, uri: String, remoteName: String?)

diff --git a/src/test/kotlin/io/titandata/titan/providers/MockTest.kt b/src/test/kotlin/io/titandata/titan/providers/MockTest.kt
@@ -54,7 +54,7 @@ class MockTest {
     fun `can install`(){
         val byteStream = ByteArrayOutputStream()
         System.setOut(PrintStream(byteStream))
-        mockProvider.install()
+        mockProvider.install("registry")
         byteStream.flush()
         val expected = String(byteStream.toByteArray()).trim()
         assertEquals(expected, "Initializing new repository")