commit 78cc6fa7da936f5a8c6a7a74e10051192c108c5f
parent fb864e4edaeb103282cc0e79c7d0bfd85081eb0e
Author: Devan Carpenter <devan@taler.net>
Date: Mon, 17 Jul 2023 00:56:18 -0400
buildbot: containers: add volume for artifacts
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -194,7 +194,7 @@ def container_add_step(HALT_ON_FAILURE,
return steps.ShellSequence(
name=stepName,
commands=[
- util.ShellArg(command=["sg", "docker", "-c", f"docker run --rm --user $(id -u):$(id -g) --volume {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 --volume /home/container-worker/container_artifacts:/artifacts --workdir /workdir {CONTAINER_NAME} {jobCmd}"],
logname='run inside container',
haltOnFailure=HALT_ON_FAILURE),
],
@@ -207,7 +207,7 @@ def container_add_step(HALT_ON_FAILURE,
commands=[
util.ShellArg(command=["sg", "docker", "-c", f"docker build -t {CONTAINER_NAME} -f {containerFile} ."],
logname='build container', haltOnFailure=True),
- util.ShellArg(command=["sg", "docker", "-c", f"docker run --rm --user $(id -u):$(id -g) --volume {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 --volume /home/container-worker/container_artifacts:/artifacts --workdir /workdir {CONTAINER_NAME} {jobCmd}"],
logname='run inside container',
haltOnFailure=HALT_ON_FAILURE),
],