summaryrefslogtreecommitdiff
path: root/crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala
diff options
context:
space:
mode:
Diffstat (limited to 'crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala')
-rw-r--r--crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala12
1 files changed, 5 insertions, 7 deletions
diff --git a/crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala b/crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala
index 715ca65..25a7f2e 100644
--- a/crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala
+++ b/crashboxd/src/main/scala/io/crashbox/ci/DockerExecutor.scala
@@ -19,11 +19,9 @@ import com.spotify.docker.client.exceptions.ContainerNotFoundException
import com.spotify.docker.client.messages.{ContainerConfig, HostConfig}
import com.spotify.docker.client.messages.HostConfig.Bind
-case class ExecutionId(id: String) extends AnyVal
object DockerExecutor {
-
def containerUser = "crashbox"
def containerWorkDirectory = "/home/crashbox"
def containerKillTimeout = 5.seconds
@@ -31,7 +29,7 @@ object DockerExecutor {
}
class DockerExecutor(uri: String = "unix:///run/docker.sock")(
- implicit system: ActorSystem) extends Executor[DockerEnvironment] {
+ implicit system: ActorSystem) extends Executor[DockerEnvironment, DockerExecutionId] {
import DockerExecutor._
import system.log
@@ -50,7 +48,7 @@ class DockerExecutor(uri: String = "unix:///run/docker.sock")(
script: String,
buildDirectory: File,
out: OutputStream
- ): Future[ExecutionId] =
+ ): Future[DockerExecutionId] =
Future {
val volume = Bind
.builder()
@@ -91,10 +89,10 @@ class DockerExecutor(uri: String = "unix:///run/docker.sock")(
}
}
}
- ExecutionId(container)
+ DockerExecutionId(container)
}(system.dispatcher)
- def result(id: ExecutionId): Future[Int] =
+ def result(id: DockerExecutionId): Future[Int] =
Future {
log.debug(s"Waiting for container $id to exit")
val res: Int = dockerClient.waitContainer(id.id).statusCode()
@@ -102,7 +100,7 @@ class DockerExecutor(uri: String = "unix:///run/docker.sock")(
res
}(system.dispatcher)
- def stop(id: ExecutionId): Unit = {
+ def stop(id: DockerExecutionId): Unit = {
try {
log.debug(s"Stopping container $id")
dockerClient.stopContainer(id.id,