From 00da46762d8e288c2e99ebc7cdcd75ce9946b7f3 Mon Sep 17 00:00:00 2001 From: az Date: Mon, 29 Nov 2021 14:55:58 +0100 Subject: [PATCH] [skip ci] add options to container start --- .../provs/core/docker/HostDocker.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt index 550234a..5e81002 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt @@ -7,6 +7,8 @@ import org.domaindrivenarchitecture.provs.core.docker.platforms.* import org.domaindrivenarchitecture.provs.core.platforms.UbuntuProv import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +private const val DOCKER_NOT_SUPPORTED = "docker not yet supported for " + /** * Builds a docker image if not yet existing. */ @@ -14,7 +16,7 @@ fun Prov.dockerProvideImage(image: DockerImage, skipIfExisting: Boolean = true, if (this is UbuntuProv) { return this.dockerProvideImagePlatform(image, skipIfExisting, sudo) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } } @@ -25,7 +27,7 @@ fun Prov.dockerImageExists(imageName: String, sudo: Boolean = true) : Boolean { if (this is UbuntuProv) { return this.dockerImageExistsPlatform(imageName, sudo) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } } @@ -40,12 +42,13 @@ fun Prov.provideContainer( containerName: String, imageName: String = "ubuntu", startMode: ContainerStartMode = ContainerStartMode.USE_RUNNING_ELSE_CREATE, - sudo: Boolean = true + sudo: Boolean = true, + options: String = "" ) : ProvResult { if (this is UbuntuProv) { - return this.provideContainerPlatform(containerName, imageName, startMode, sudo) + return this.provideContainerPlatform(containerName, imageName, startMode, sudo, options) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } } @@ -54,7 +57,7 @@ fun Prov.containerRuns(containerName: String, sudo: Boolean = true) : Boolean { if (this is UbuntuProv) { return this.containerRunsPlatform(containerName, sudo) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } } @@ -67,7 +70,7 @@ fun Prov.runContainer( if (this is UbuntuProv) { return this.runContainerPlatform(containerName, imageName, sudo) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } } @@ -79,6 +82,6 @@ fun Prov.exitAndRmContainer( if (this is UbuntuProv) { return this.exitAndRmContainerPlatform(containerName, sudo) } else { - throw RuntimeException("docker not yet supported for " + (this as UbuntuProv).javaClass) + throw RuntimeException(DOCKER_NOT_SUPPORTED + (this as UbuntuProv).javaClass) } }