Skip to content

Commit 6c54f46

Browse files
joan38muuki88
authored andcommitted
Give an absolute path to the entrypoint (#1101)
1 parent 4440944 commit 6c54f46

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ object DockerPlugin extends AutoPlugin {
8080
Some((version in Docker).value)
8181
),
8282
dockerUpdateLatest := false,
83-
dockerEntrypoint := Seq("bin/%s" format executableScriptName.value),
83+
dockerEntrypoint := Seq(s"${(defaultLinuxInstallLocation in Docker).value}/bin/${executableScriptName.value}"),
8484
dockerCmd := Seq(),
8585
dockerExecCommand := Seq("docker"),
8686
dockerVersion := Try(Process(dockerExecCommand.value ++ Seq("version", "--format", "'{{.Server.Version}}'")).!!).toOption

src/sbt-test/docker/test-executableScriptName/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ maintainer := "Gary Coady <[email protected]>"
1313
TaskKey[Unit]("checkDockerfile") := {
1414
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
1515
assert(
16-
dockerfile.contains("ENTRYPOINT [\"bin/docker-exec\"]\n"),
17-
"dockerfile doesn't contain ENTRYPOINT [\"docker-exec\"]\n" + dockerfile
16+
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-exec\"]\n"),
17+
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
1818
)
1919
streams.value.log.success("Successfully tested control script")
2020
()

src/sbt-test/docker/test-packageName-universal/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ maintainer := "Gary Coady <[email protected]>"
1111
TaskKey[Unit]("checkDockerfile") := {
1212
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
1313
assert(
14-
dockerfile.contains("ENTRYPOINT [\"bin/docker-test\"]\n"),
15-
"dockerfile doesn't contain ENTRYPOINT [\"docker-test\"]\n" + dockerfile
14+
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n"),
15+
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
1616
)
1717
streams.value.log.success("Successfully tested control script")
1818
()

src/sbt-test/docker/test-packageName/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ maintainer := "Gary Coady <[email protected]>"
1212
TaskKey[Unit]("checkDockerfile") := {
1313
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
1414
assert(
15-
dockerfile.contains("ENTRYPOINT [\"bin/docker-test\"]\n"),
16-
"dockerfile doesn't contain ENTRYPOINT [\"docker-test\"]\n" + dockerfile
15+
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n"),
16+
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
1717
)
1818
streams.value.log.success("Successfully tested control script")
1919
()

0 commit comments

Comments
 (0)