diff options
| author | Devan Carpenter <devan@taler.net> | 2023-07-11 18:47:20 -0400 |
|---|---|---|
| committer | Devan Carpenter <devan@taler.net> | 2023-07-11 22:27:48 -0400 |
| commit | ed531447a883f5b251337475f56eeef75d45aa3e (patch) | |
| tree | 3e5f2346f0b3b05e9f8aff6388735ef74cd0fc88 | |
| parent | 521ac21031c3bb699d59c11fb498366aa032b69c (diff) | |
| download | deployment-dev/devan-carpenter/buildbot-refactor.tar.gz deployment-dev/devan-carpenter/buildbot-refactor.tar.bz2 deployment-dev/devan-carpenter/buildbot-refactor.zip | |
buildbot: switch from podman to dockerdev/devan-carpenter/buildbot-refactor
version of podman is too old and has bugs. use docker as the container
runtime for now.
docker requires that the user be in the "docker" group. "sg" is used to
ensure that the command is excuted with the correct group id.
| -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")) # |