Skip to content

Commit 1ce0ae8

Browse files
muuki88Wojciech Pitula
authored and
Wojciech Pitula
committed
FIX sbt#981 Documentation incorrect -- Docker v1.10 or higher required
1 parent 2e5b9ec commit 1ce0ae8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/scala/com/typesafe/sbt/packager/universal/Archives.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,9 @@ object Archives {
240240

241241
IO.copy(m2)
242242
// TODO - Is this enough?
243-
for (f <- (m2 map { case (_, f) => f });
244-
if f.getAbsolutePath contains "/bin/") {
245-
println("Making " + f.getAbsolutePath + " executable")
246-
f.setExecutable(true, false)
243+
for ( (from, to) <- m2 if (to.getAbsolutePath contains "/bin/") || from.canExecute ) {
244+
println("Making " + to.getAbsolutePath + " executable")
245+
to.setExecutable(true, false)
247246
}
248247

249248
IO.createDirectory(tarball.getParentFile)

src/sphinx/formats/docker.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sbt-native-packager focuses on creating a Docker image which can "just run" the
1616
Requirements
1717
------------
1818

19-
You need the version 1.3 or higher of the docker console client installed.
19+
You need the version 1.10 or higher of the docker console client installed.
2020
SBT Native Packager doesn't use the REST API, but instead uses the CLI directly.
2121

2222
It is currently not possible to provide authentication for Docker repositories from within the build.

0 commit comments

Comments
 (0)