Skip to content

Support for privileged mode #88

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

Merged
merged 2 commits into from
Dec 7, 2021
Merged

Support for privileged mode #88

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
11138bb
Support for privileged mode
manuelbernhardt Aug 3, 2017
8dae584
Merge branch 'master' of github.com:whisklabs/docker-it-scala into pr…
c-solo Dec 7, 2021
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
6 changes: 4 additions & 2 deletions config/src/main/scala/com/whisk/docker/config/DockerTypesafeConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ object DockerTypesafeConfig extends DockerKitDockerJava {
`ready-checker`: Option[DockerConfigReadyChecker],
`volume-maps`: Seq[VolumeMapping] = Seq.empty,
memory: Option[Long],
`memory-reservation`: Option[Long]) {
`memory-reservation`: Option[Long],
privileged: Boolean = false) {

def toDockerContainer(): DockerContainer = {
val bindPorts = `port-maps`.fold(EmptyPortBindings) { _.values.map(_.asTuple).toMap }.toSeq.map {
Expand All @@ -69,7 +70,8 @@ object DockerTypesafeConfig extends DockerKitDockerJava {

val hostConfig = HostConfig(
memory = memory,
memoryReservation = `memory-reservation`
memoryReservation = `memory-reservation`,
privileged = privileged
)

DockerContainer(
Expand Down
8 changes: 7 additions & 1 deletion core/src/main/scala/com/whisk/docker/DockerContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ case class HostConfig(
/**
* the soft limit on memory usage (in bytes)
*/
memoryReservation: Option[Long] = None
memoryReservation: Option[Long] = None,

/**
* whether to run in privileged mode
*/
privileged: Boolean = false

)

case class DockerContainer(image: String,
Expand Down
3 changes: 3 additions & 0 deletions impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ class DockerJavaExecutor(override val host: String, client: DockerClient)
.withOption(spec.hostConfig.flatMap(_.memoryReservation)) {
case (config, memoryReservation) => config.withMemoryReservation(memoryReservation)
}
.withOption(spec.hostConfig.map(_.privileged)) {
case (config, privileged) => config.withPrivileged(privileged)
}

val cmd = client
.createContainerCmd(spec.image)
Expand Down
3 changes: 3 additions & 0 deletions impl/spotify/src/main/scala/com/whisk/docker/impl/spotify/SpotifyDockerCommandExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ class SpotifyDockerCommandExecutor(override val host: String, client: DockerClie
.withOption(spec.hostConfig.flatMap(_.memoryReservation)) {
case (config, reservation) => config.memoryReservation(reservation)
}
.withOption(spec.hostConfig.map(_.privileged)) {
case (config, privileged) => config.privileged(privileged)
}
.build()
}

Expand Down