qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
	berrange@redhat.com, f4bug@amsat.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <willianr@redhat.com>,
	stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
	"Alex Bennée" <alex.bennee@linaro.org>,
	aurelien@aurel32.net
Subject: [PATCH v1 04/25] tests/docker: allow "update" to add the current user
Date: Mon, 19 Apr 2021 15:54:14 +0100	[thread overview]
Message-ID: <20210419145435.14083-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210419145435.14083-1-alex.bennee@linaro.org>

The current user functionality is used for cross compiling to avoid
complications with permissions when building test programs. However
for images that come from the registry we still need the ability to
add the user after the fact.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/docker.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 9b3425fec2..7a14058801 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -517,7 +517,7 @@ def run(self, args, argv):
 
 
 class UpdateCommand(SubCommand):
-    """ Update a docker image with new executables. Args: <tag> <executable>"""
+    """ Update a docker image. Args: <tag> <actions>"""
     name = "update"
 
     def args(self, parser):
@@ -525,6 +525,9 @@ def args(self, parser):
                             help="Image Tag")
         parser.add_argument("--executable",
                             help="Executable to copy")
+        parser.add_argument("--add-current-user", "-u", dest="user",
+                            action="store_true",
+                            help="Add the current user to image's passwd")
 
     def run(self, args, argv):
         # Create a temporary tarball with our whole build context and
@@ -564,6 +567,13 @@ def run(self, args, argv):
 
             df.write(u"ADD . /\n")
 
+        if args.user:
+            uid = os.getuid()
+            uname = getpwuid(uid).pw_name
+            df.write("\n")
+            df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" %
+                     (uname, uid, uname))
+
         df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8"))
 
         df_tar = TarInfo(name="Dockerfile")
-- 
2.20.1



  parent reply	other threads:[~2021-04-19 14:58 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-19 14:54 [PATCH for post 6.0 v1 00/25] testing/next (hexagon/tricore/test cc) Alex Bennée
2021-04-19 14:54 ` [PATCH v1 01/25] checkpatch: Fix use of uninitialized value Alex Bennée
2021-04-19 14:54 ` [PATCH v1 02/25] tests/docker: fix copying of executable in "update" Alex Bennée
2021-04-23 17:35   ` Willian Rampazzo
2021-04-19 14:54 ` [PATCH v1 03/25] tests/docker: make executable an optional argument to "update" Alex Bennée
2021-04-23 17:37   ` Willian Rampazzo
2021-04-19 14:54 ` Alex Bennée [this message]
2021-04-23 18:35   ` [PATCH v1 04/25] tests/docker: allow "update" to add the current user Willian Rampazzo
2021-04-19 14:54 ` [PATCH v1 05/25] tests/docker: add "fetch" sub-command Alex Bennée
2021-04-23 18:37   ` Willian Rampazzo
2021-04-19 14:54 ` [PATCH v1 06/25] docker: Add Hexagon image Alex Bennée
2021-04-23 18:41   ` Willian Rampazzo
2021-04-23 22:25   ` Philippe Mathieu-Daudé
2021-04-19 14:54 ` [PATCH v1 07/25] tests/tcg: Use Hexagon Docker image Alex Bennée
2021-04-23 22:23   ` Philippe Mathieu-Daudé
2021-04-19 14:54 ` [PATCH v1 08/25] gitlab: add build-user-hexagon test Alex Bennée
2021-04-23 18:38   ` Willian Rampazzo
2021-04-23 22:23   ` Philippe Mathieu-Daudé
2021-05-11 14:41   ` Alex Bennée
2021-05-11 14:53     ` Brian Cain
2021-05-11 15:08       ` Brian Cain
2021-05-12  7:34         ` Alex Bennée
2021-04-19 14:54 ` [PATCH v1 09/25] tests/tcg: don't iterate through other arch compilers Alex Bennée
2021-04-19 14:54 ` [PATCH v1 10/25] tests/docker: Added libbpf library to the docker files Alex Bennée
2021-04-23 18:39   ` Willian Rampazzo
2021-04-23 22:30   ` Philippe Mathieu-Daudé
2021-04-19 14:54 ` [PATCH v1 11/25] tests/tcg: Add docker_as and docker_ld cmds Alex Bennée
2021-04-23 22:31   ` Philippe Mathieu-Daudé
2021-04-19 14:54 ` [PATCH v1 12/25] tests/tcg: Run timeout cmds using --foreground Alex Bennée
2021-04-19 14:54 ` [PATCH v1 13/25] hw/tricore: Add testdevice for tests in tests/tcg/ Alex Bennée
2021-04-26  9:37   ` Philippe Mathieu-Daudé
2021-04-26 10:15     ` Alex Bennée
2021-04-26 12:03       ` Philippe Mathieu-Daudé
2021-04-19 14:54 ` [PATCH v1 14/25] tests/tcg/tricore: Add build infrastructure Alex Bennée
2021-04-19 14:54 ` [PATCH v1 15/25] configure: Emit HOST_CC to config-host.mak Alex Bennée
2021-04-19 14:54 ` [PATCH v1 16/25] tests/tcg/tricore: Add macros to create tests and first test 'abs' Alex Bennée
2021-04-19 14:54 ` [PATCH v1 17/25] tests/tcg/tricore: Add bmerge test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 18/25] tests/tcg/tricore: Add clz test Alex Bennée
2021-04-29 13:53   ` Bastian Koppelmann
2021-04-19 14:54 ` [PATCH v1 19/25] tests/tcg/tricore: Add dvstep test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 20/25] tests/tcg/tricore: Add fadd test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 21/25] tests/tcg/tricore: Add fmul test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 22/25] tests/tcg/tricore: Add ftoi test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 23/25] tests/tcg/tricore: Add madd test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 24/25] tests/tcg/tricore: Add msub test Alex Bennée
2021-04-19 14:54 ` [PATCH v1 25/25] tests/tcg/tricore: Add muls test Alex Bennée
2021-04-19 15:51 ` [PATCH for post 6.0 v1 00/25] testing/next (hexagon/tricore/test cc) no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210419145435.14083-5-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=willianr@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).