aboutsummaryrefslogtreecommitdiff
path: root/xenial-i386-tcwg-base
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-06-06 08:48:23 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-06-06 08:48:23 +0000
commitd6d118dcd94f8d086743653c43b9042fb7a6e18c (patch)
treefb2814828e4c7fae9fc405d1568feb146d606daf /xenial-i386-tcwg-base
parenteb7e35386ee0c4015b1c4279f4177fa40aa3baca (diff)
tcwg-build: Use user data from home-data/passwd
Move passwd file to home-data/, and update tcwg-build to use it. Change-Id: Ie409103ae4e47a8f9cf393a4052ddec92509a8af
Diffstat (limited to 'xenial-i386-tcwg-base')
-rw-r--r--xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile13
1 files changed, 8 insertions, 5 deletions
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
index 8cbd2206..92001b47 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
@@ -1,12 +1,15 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-i386-tcwg-base-ubuntu:xenial
-COPY tcwg-buildslave /home-data/tcwg-buildslave
-COPY tcwg-benchmark /home-data/tcwg-benchmark
+COPY home-data/ /home-data/
RUN new-user.sh --group tcwg-infra:9000 \
- && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \
- && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \
+ && while read line; do \
+ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \
+ continue; \
+ fi; \
+ new-user.sh --passwd "$line" --home-data /home-data; \
+ done </home-data/passwd \
&& rm -rf /home-data/ \
&& mkdir -p /home/tcwg-buildslave/workspace
@@ -21,4 +24,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 2e55087ee50a83f6114714601050b037
+# checksum: 951d01a420d9f6a21986c800030954b6