summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Carpenter <devan@taler.net>2023-06-12 15:31:00 -0400
committerDevan Carpenter <devan@taler.net>2023-06-12 15:31:00 -0400
commit3a1845aadd9736f5e0351c17df85d982b079264e (patch)
treeee5787acd8cb7efd56660cad3cc37ef2cb4c2868
parent1f7d46151dc81a6da2446b6a32c4fadbc9f83a74 (diff)
downloaddeployment-3a1845aadd9736f5e0351c17df85d982b079264e.tar.gz
deployment-3a1845aadd9736f5e0351c17df85d982b079264e.tar.bz2
deployment-3a1845aadd9736f5e0351c17df85d982b079264e.zip
buildbot: add default Containerfile path to podman
-rw-r--r--buildbot/master.cfg3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 7b1e2dd..89157bd 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -164,12 +164,13 @@ def update_deployment(factory):
# Convenience function that builds and runs a container.
def container_run_step(factory, WORK_DIR, containerName,
+ containerFile="ci/Containerfile",
jobCmd="/workdir/ci/ci.sh"):
factory.addStep(steps.ShellSequence(
name="container build and run",
commands=[
util.ShellArg(command=["podman", "build", "-t", containerName,
- "."]),
+ "-f", containerFile, "."]),
util.ShellArg(command=["podman", "run", "-ti", "--rm", "--volume",
"$PWD:/workdir", "--workdir", "/workdir",
containerName, jobCmd]),