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

docker: make None the last layer group #1370

Merged
merged 2 commits into from
Oct 5, 2020
Merged

docker: make None the last layer group #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76099a5
docker: make None the last layer group
pawitp Oct 4, 2020
4e4d834
Merge branch 'master' into improve-layer-group
muuki88 Oct 4, 2020
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
5 changes: 4 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 @@ -167,7 +167,10 @@ object DockerPlugin extends AutoPlugin {
val generalCommands = makeFromAs(base, "mainstage") +: makeMaintainer((maintainer in Docker).value).toSeq
val stage0name = "stage0"
val layerMappings = (dockerLayerMappings in Docker).value
val layerIdsAscending = layerMappings.map(_.layerId).distinct.sorted
val layerIdsAscending = layerMappings.map(_.layerId).distinct.sortWith { (a, b) =>
// Make the None (unspecified) layer the last layer
a.getOrElse(Int.MaxValue) < b.getOrElse(Int.MaxValue)
}
val stage0: Seq[CmdLike] = strategy match {
case DockerPermissionStrategy.MultiStage =>
Seq(
Expand Down
26 changes: 25 additions & 1 deletion src/sbt-test/docker/test-layer-groups/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,28 @@ dockerPackageMappings in Docker ++= Seq(
(baseDirectory.value / "docker" / "log4j.properties") -> "/opt/docker/other/log4j.properties"
)

libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.30"
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.30"

TaskKey[Unit]("checkDockerfile") := {
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val copyLines = dockerfile.linesIterator.toList.filter(_.startsWith("COPY --from=stage0"))
assertEquals(copyLines,
"""COPY --from=stage0 --chown=demiourgos728:root /1/opt/docker /opt/docker
|COPY --from=stage0 --chown=demiourgos728:root /2/opt/docker /opt/docker
|COPY --from=stage0 --chown=demiourgos728:root /54/opt/docker /opt/docker
|COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList)
}

TaskKey[Unit]("checkDockerfileWithNoLayers") := {
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val copyLines = dockerfile.linesIterator.toList.filter(_.startsWith("COPY --from=stage0"))
assertEquals(copyLines,
"""COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList)
}

def assertEquals(left: List[String], right: List[String]) =
assert(left == right,
"\n" + ((left zip right) flatMap { case (a: String, b: String) =>
if (a == b) Nil
else List("- " + a, "+ " + b)
}).mkString("\n"))
2 changes: 2 additions & 0 deletions src/sbt-test/docker/test-layer-groups/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $ exists target/docker/stage/54/opt/docker/spark

$ exec bash -c 'docker run --rm --entrypoint=ls docker-groups:0.1.0 |tr "\n" "," | grep -q "bin,lib,other,spark"'
$ exec bash -c 'docker rmi docker-groups:0.1.0'
> checkDockerfile

$ copy-file changes/nolayers.sbt layers.sbt
> reload
Expand All @@ -25,3 +26,4 @@ $ exists target/docker/stage/opt/docker/spark
$ exists target/docker/stage/opt/docker/lib/org.slf4j.slf4j-api-1.7.30.jar
$ exists target/docker/stage/opt/docker/lib/com.example.docker-groups-0.1.0.jar
$ exec bash -c 'docker run --rm --entrypoint=ls docker-groups:0.1.0 |tr "\n" "," | grep -q "bin,lib,other,spark"'
> checkDockerfileWithNoLayers