Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Give an absolute path to the entrypoint #1101

Merged
merged 1 commit into from Feb 16, 2018
Merged

Give an absolute path to the entrypoint #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@ object DockerPlugin extends AutoPlugin {
Some((version in Docker).value)
),
dockerUpdateLatest := false,
dockerEntrypoint := Seq("bin/%s" format executableScriptName.value),
dockerEntrypoint := Seq(s"${(defaultLinuxInstallLocation in Docker).value}/bin/${executableScriptName.value}"),
dockerCmd := Seq(),
dockerExecCommand := Seq("docker"),
dockerVersion := Try(Process(dockerExecCommand.value ++ Seq("version", "--format", "'{{.Server.Version}}'")).!!).toOption
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/docker/test-executableScriptName/build.sbt
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ maintainer := "Gary Coady <gary@lyranthe.org>"
TaskKey[Unit]("checkDockerfile") := {
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
assert(
dockerfile.contains("ENTRYPOINT [\"bin/docker-exec\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"docker-exec\"]\n" + dockerfile
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-exec\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
)
streams.value.log.success("Successfully tested control script")
()
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/docker/test-packageName-universal/build.sbt
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ maintainer := "Gary Coady <gary@lyranthe.org>"
TaskKey[Unit]("checkDockerfile") := {
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
assert(
dockerfile.contains("ENTRYPOINT [\"bin/docker-test\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"docker-test\"]\n" + dockerfile
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
)
streams.value.log.success("Successfully tested control script")
()
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/docker/test-packageName/build.sbt
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@ maintainer := "Gary Coady <gary@lyranthe.org>"
TaskKey[Unit]("checkDockerfile") := {
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
assert(
dockerfile.contains("ENTRYPOINT [\"bin/docker-test\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"docker-test\"]\n" + dockerfile
dockerfile.contains("ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n"),
"dockerfile doesn't contain ENTRYPOINT [\"/opt/docker/bin/docker-test\"]\n" + dockerfile
)
streams.value.log.success("Successfully tested control script")
()
Expand Down