[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/30] tests/docker: allow "update" to add the current user
From: |
Alex Bennée |
Subject: |
[PATCH v2 04/30] tests/docker: allow "update" to add the current user |
Date: |
Tue, 4 May 2021 11:01:57 +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.
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
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
- [PATCH v2 00/30] testing/next (hexagon, tricore, ppc, signals, cirrus), Alex Bennée, 2021/05/04
- [PATCH v2 01/30] checkpatch: Fix use of uninitialized value, Alex Bennée, 2021/05/04
- [PATCH v2 02/30] tests/docker: fix copying of executable in "update", Alex Bennée, 2021/05/04
- [PATCH v2 03/30] tests/docker: make executable an optional argument to "update", Alex Bennée, 2021/05/04
- [PATCH v2 04/30] tests/docker: allow "update" to add the current user,
Alex Bennée <=
- [PATCH v2 05/30] tests/docker: add "fetch" sub-command, Alex Bennée, 2021/05/04
- [PATCH v2 08/30] gitlab: add build-user-hexagon test, Alex Bennée, 2021/05/04
- [PATCH v2 06/30] docker: Add Hexagon image, Alex Bennée, 2021/05/04
- [PATCH v2 11/30] tests/tcg: Add docker_as and docker_ld cmds, Alex Bennée, 2021/05/04
- [PATCH v2 07/30] tests/tcg: Use Hexagon Docker image, Alex Bennée, 2021/05/04
- [PATCH v2 10/30] tests/docker: Added libbpf library to the docker files., Alex Bennée, 2021/05/04
- [PATCH v2 09/30] tests/tcg: don't iterate through other arch compilers, Alex Bennée, 2021/05/04
- [PATCH v2 13/30] hw/tricore: Add testdevice for tests in tests/tcg/, Alex Bennée, 2021/05/04
- [PATCH v2 21/30] tests/tcg/tricore: Add fmul test, Alex Bennée, 2021/05/04
- [PATCH v2 14/30] tests/tcg/tricore: Add build infrastructure, Alex Bennée, 2021/05/04