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.

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

Run stage0 as root during Docker build #1197

Merged
merged 1 commit into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ object DockerPlugin extends AutoPlugin {
Seq(
makeFromAs(base, stage0name),
makeWorkdir(dockerBaseDirectory),
makeUserAdd(user, uid, gid),
makeCopy(dockerBaseDirectory),
makeUser("root"),
makeChmod(dockerChmodType.value, Seq(dockerBaseDirectory)),
DockerStageBreak
)
Expand Down Expand Up @@ -337,6 +337,13 @@ object DockerPlugin extends AutoPlugin {
daemonUser
)

/**
* @param daemonUser
* @return USER docker command
*/
private final def makeUser(daemonUser: String): CmdLike =
Cmd("USER", daemonUser)

/**
* @param userId userId of the daemon user
* @return USER docker command
Expand Down
16 changes: 8 additions & 8 deletions src/sbt-test/docker/file-permission/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ lazy val root = (project in file("."))
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val lines = dockerfile.linesIterator.toList
assertEquals(lines,
"""FROM openjdk:8 as stage0
"""FROM fabric8/java-centos-openjdk8-jdk as stage0
|WORKDIR /opt/docker
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|COPY opt /opt
|USER root
|RUN ["chmod", "-R", "u=rX,g=rX", "/opt/docker"]
|
|FROM openjdk:8
|FROM fabric8/java-centos-openjdk8-jdk
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|WORKDIR /opt/docker
|COPY --from=stage0 --chown=daemon:root /opt/docker /opt/docker
Expand All @@ -32,7 +32,7 @@ lazy val root = (project in file("."))
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val lines = dockerfile.linesIterator.toList
assertEquals(lines,
"""FROM openjdk:8
"""FROM fabric8/java-centos-openjdk8-jdk
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|WORKDIR /opt/docker
|COPY opt /opt
Expand All @@ -59,7 +59,7 @@ lazy val root = (project in file("."))
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val lines = dockerfile.linesIterator.toList
assertEquals(lines,
"""FROM openjdk:8
"""FROM fabric8/java-centos-openjdk8-jdk
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|WORKDIR /opt/docker
|COPY --chown=daemon:root opt /opt
Expand All @@ -72,13 +72,13 @@ lazy val root = (project in file("."))
val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile")
val lines = dockerfile.linesIterator.toList
assertEquals(lines,
"""FROM openjdk:8 as stage0
"""FROM fabric8/java-centos-openjdk8-jdk as stage0
|WORKDIR /opt/docker
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|COPY opt /opt
|USER root
|RUN ["chmod", "-R", "u=rwX,g=rwX", "/opt/docker"]
|
|FROM openjdk:8
|FROM fabric8/java-centos-openjdk8-jdk
|RUN id -u daemon || useradd --system --create-home --uid 1001 --gid 0 daemon
|WORKDIR /opt/docker
|COPY --from=stage0 --chown=daemon:root /opt/docker /opt/docker
Expand Down
1 change: 1 addition & 0 deletions src/sbt-test/docker/file-permission/change.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import com.typesafe.sbt.packager.docker._

dockerPermissionStrategy := DockerPermissionStrategy.CopyChown
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import com.typesafe.sbt.packager.docker._

dockerPermissionStrategy := DockerPermissionStrategy.None
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ import com.typesafe.sbt.packager.docker._

dockerPermissionStrategy := DockerPermissionStrategy.MultiStage
dockerChmodType := DockerChmodType.UserGroupWriteExecute
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"