Skip to content

Commit af21f71

Browse files
dwickernmuuki88
authored andcommitted
convert dockerVersion from a setting to a task (#1058)
1 parent f1670d5 commit af21f71

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/scala/com/typesafe/sbt/packager/docker/DockerSpotifyClientPlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object DockerSpotifyClientPlugin extends AutoPlugin {
8484
}
8585
}
8686

87-
def dockerServerVersion: Def.Initialize[Option[DockerVersion]] = Def.setting {
87+
def dockerServerVersion: Def.Initialize[Task[Option[DockerVersion]]] = Def.task {
8888
val docker: DockerClient = DefaultDockerClient.fromEnv().build()
8989
DockerVersion.parse(docker.version().version())
9090
}

src/main/scala/com/typesafe/sbt/packager/docker/Keys.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ trait DockerKeys {
2929
"Docker CMD. Used together with dockerEntrypoint. Arguments passed in exec form"
3030
)
3131
val dockerExecCommand = SettingKey[Seq[String]]("dockerExecCommand", "The shell command used to exec Docker")
32-
val dockerVersion = SettingKey[Option[DockerVersion]]("dockerVersion", "The docker server version")
32+
val dockerVersion = TaskKey[Option[DockerVersion]]("dockerVersion", "The docker server version")
3333
val dockerBuildOptions = SettingKey[Seq[String]]("dockerBuildOptions", "Options used for the Docker build")
3434
val dockerBuildCommand = SettingKey[Seq[String]]("dockerBuildCommand", "Command for building the Docker image")
3535
val dockerLabels = SettingKey[Map[String, String]]("dockerLabels", "Labels applied to the Docker image")

0 commit comments

Comments
 (0)