[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/29] tests/docker: allow "update" to add the current user
From: |
Alex Bennée |
Subject: |
[PULL 03/29] tests/docker: allow "update" to add the current user |
Date: |
Mon, 17 May 2021 17:09:56 +0100 |
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>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210512102051.12134-5-alex.bennee@linaro.org>
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
- [PULL 00/29] testing and plugin updates, Alex Bennée, 2021/05/17
- [PULL 02/29] tests/docker: make executable an optional argument to "update", Alex Bennée, 2021/05/17
- [PULL 01/29] tests/docker: fix copying of executable in "update", Alex Bennée, 2021/05/17
- [PULL 04/29] tests/docker: add "fetch" sub-command, Alex Bennée, 2021/05/17
- [PULL 03/29] tests/docker: allow "update" to add the current user,
Alex Bennée <=
- [PULL 08/29] tests/tcg: Run timeout cmds using --foreground, Alex Bennée, 2021/05/17
- [PULL 09/29] hw/tricore: Add testdevice for tests in tests/tcg/, Alex Bennée, 2021/05/17
- [PULL 05/29] docker: Add Hexagon image, Alex Bennée, 2021/05/17
- [PULL 11/29] configure: Emit HOST_CC to config-host.mak, Alex Bennée, 2021/05/17
- [PULL 13/29] tests/tcg/tricore: Add bmerge test, Alex Bennée, 2021/05/17
- [PULL 10/29] tests/tcg/tricore: Add build infrastructure, Alex Bennée, 2021/05/17
- [PULL 07/29] tests/docker: Added libbpf library to the docker files., Alex Bennée, 2021/05/17
- [PULL 06/29] tests/tcg: Use Hexagon Docker image, Alex Bennée, 2021/05/17
- [PULL 12/29] tests/tcg/tricore: Add macros to create tests and first test 'abs', Alex Bennée, 2021/05/17
- [PULL 18/29] tests/tcg/tricore: Add ftoi test, Alex Bennée, 2021/05/17