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

Use docker on windows #573 #588

Merged
merged 1 commit into from
May 27, 2015
Merged

Use docker on windows #573 #588

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ object DockerPlugin extends AutoPlugin {

import autoImport._

/**
* The separator for makeAdd force UNIX separator.
* The separator doesn't depend to OS where i build Dockerfile.
*/
val UnixSeparatorChar = '/'

override def requires = universal.UniversalPlugin

override lazy val projectSettings = Seq(
Expand Down Expand Up @@ -149,7 +155,7 @@ object DockerPlugin extends AutoPlugin {
* @return ADD command adding all files inside the installation directory
*/
private final def makeAdd(dockerBaseDirectory: String): CmdLike = {
val files = dockerBaseDirectory.split(java.io.File.separator)(1)
val files = dockerBaseDirectory.split(UnixSeparatorChar)(1)
Cmd("ADD", s"$files /$files")
}

Expand Down