Skip to content

Commit ebc43f0

Browse files
dwagenkDaniel Wagenknecht
and
Daniel Wagenknecht
authored
Implement support for podmans userns option (#1566)
Co-authored-by: Daniel Wagenknecht <dwagenknecht@emlix.com>
1 parent 9f09a45 commit ebc43f0

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

src/argv.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@ export class Argv {
207207
return this.map.get("umask") ?? true;
208208
}
209209

210+
get userns (): string | undefined {
211+
return this.map.get("userns");
212+
}
213+
210214
get privileged (): boolean {
211215
return this.map.get("privileged") ?? false;
212216
}

src/index.ts

100755100644
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ process.on("SIGUSR2", async () => await cleanupJobResources(jobs));
202202
description: "Sets docker user to 0:0",
203203
requiresArg: false,
204204
})
205+
.option("userns", {
206+
type: "string",
207+
description: "Set docker executor userns option",
208+
requiresArg: false,
209+
})
205210
.option("privileged", {
206211
type: "boolean",
207212
description: "Set docker executor to privileged mode",

src/job.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,10 @@ export class Job {
845845
dockerCmd += "--user 0:0 ";
846846
}
847847

848+
if (this.argv.userns != undefined) {
849+
dockerCmd += `--userns=${this.argv.userns} `;
850+
}
851+
848852
if (this.argv.containerMacAddress) {
849853
dockerCmd += `--mac-address "${this.argv.containerMacAddress}" `;
850854
}
@@ -1405,6 +1409,10 @@ export class Job {
14051409
dockerCmd += "--user 0:0 ";
14061410
}
14071411

1412+
if (this.argv.userns != undefined) {
1413+
dockerCmd += `--userns=${this.argv.userns} `;
1414+
}
1415+
14081416
if (this.argv.privileged) {
14091417
dockerCmd += "--privileged ";
14101418
}

0 commit comments

Comments
 (0)