gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-deployment] branch master updated: buildbot: use podman as contai


From: gnunet
Subject: [taler-deployment] branch master updated: buildbot: use podman as container runtime
Date: Fri, 25 Aug 2023 08:27:19 +0200

This is an automated email from the git hooks/post-receive script.

devan-carpenter pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 36bbc4b  buildbot: use podman as container runtime
36bbc4b is described below

commit 36bbc4bc6badcd150ec2ec61d0f7d677def6b7c3
Author: Devan Carpenter <devan@taler.net>
AuthorDate: Fri Aug 25 02:08:41 2023 -0400

    buildbot: use podman as container runtime
    
    despite having an older version of podman, its handling of filesytem
    permissions makes it a more sane choice than docker.
---
 buildbot/master.cfg | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 2658c67..e66cf15 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -195,7 +195,11 @@ 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 --volume 
/home/container-worker/container_artifacts:/artifacts --workdir /workdir 
{CONTAINER_NAME} {jobCmd}"],
+                    util.ShellArg(command=["podman", "run", "--rm",
+                                           "--volume", f"{WORK_DIR}:/workdir",
+                                           "--volume", 
"/home/container-worker/container_artifacts:/artifacts",
+                                           "--workdir", "/workdir",
+                                           CONTAINER_NAME, jobCmd],
                                   logname='run inside container',
                                   haltOnFailure=HALT_ON_FAILURE),
                     ],
@@ -206,9 +210,14 @@ def container_add_step(HALT_ON_FAILURE,
         return steps.ShellSequence(
                 name=stepName,
                 commands=[
-                    util.ShellArg(command=["sg", "docker", "-c", f"docker 
build -t {CONTAINER_NAME} -f {containerFile} ."],
+                    util.ShellArg(command=["podman", "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 --volume 
/home/container-worker/container_artifacts:/artifacts --workdir /workdir 
{CONTAINER_NAME} {jobCmd}"],
+                    util.ShellArg(command=["podman", "run", "--rm",
+                                           "--volume", f"{WORK_DIR}:/workdir",
+                                           "--volume", 
"/home/container-worker/container_artifacts:/artifacts",
+                                           "--workdir", "/workdir",
+                                           CONTAINER_NAME, jobCmd],
                                   logname='run inside container',
                                   haltOnFailure=HALT_ON_FAILURE),
                     ],

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]