diff options
Diffstat (limited to 'buildbot/master.cfg')
| -rw-r--r-- | buildbot/master.cfg | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 7ddfc4a..f935ecb 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -194,10 +194,7 @@ def container_add_step(HALT_ON_FAILURE, return steps.ShellSequence( name=stepName, commands=[ - util.ShellArg(command=["podman", "run", "--rm", - "--volume", f"{WORK_DIR}:/workdir", - "--workdir", "/workdir", - CONTAINER_NAME, jobCmd], + util.ShellArg(command=["sg", "docker", "-c", f"docker run --rm --user $(id -u):$(id -g) --volume {WORK_DIR}:/workdir --workdir /workdir {CONTAINER_NAME} {jobCmd}"], logname='run inside container', haltOnFailure=HALT_ON_FAILURE), ], @@ -208,13 +205,9 @@ def container_add_step(HALT_ON_FAILURE, return steps.ShellSequence( name=stepName, commands=[ - util.ShellArg(command=["podman", "build", "-t", CONTAINER_NAME, - "-f", containerFile, "."], + util.ShellArg(command=["sg", "docker", "-c", f"docker build -t {CONTAINER_NAME} -f {containerFile} ."], logname='build container', haltOnFailure=True), - util.ShellArg(command=["podman", "run", "--rm", - "--volume", f"{WORK_DIR}:/workdir", - "--workdir", "/workdir", - CONTAINER_NAME, jobCmd], + util.ShellArg(command=["sg", "docker", "-c", f"docker run --rm --user $(id -u):$(id -g) --volume {WORK_DIR}:/workdir --workdir /workdir {CONTAINER_NAME} {jobCmd}"], logname='run inside container', haltOnFailure=HALT_ON_FAILURE), ], @@ -1229,7 +1222,7 @@ EMAIL_ALERTS.append("packaging-ubuntu-builder") # 19: CONTAINER FACTORY ##################### ############################################# ## -# These factories uses the standard podman worker. +# These factories uses the standard container worker. WORKERS.append(Worker("container-worker", "container-pass")) # |