diff options
Diffstat (limited to 'xenial-arm64-tcwg-base')
-rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile | 13 | ||||
-rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 12 |
2 files changed, 15 insertions, 10 deletions
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index c8405b72..ec5854d2 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -1,13 +1,16 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-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 -# checksum: c416a53e9a9b892d7de3e78c70a02858 +# checksum: d4cc5ee96189482489c8b68ac4ea5f2e diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 289f7613..862d96c7 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -1,12 +1,14 @@ # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial -COPY passwd start.sh / COPY home-data/ /home-data/ -RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 \ && while read line; do \ new-user.sh --passwd "$line" --home-data /home-data; \ - done </passwd \ - && rm -rf /passwd /home-data/ -# checksum: ec94afcaca03b088611a5457c8d37222 + done </home-data/passwd \ + && rm -rf /home-data/ + +COPY start.sh / +# checksum: 8310168236ead50fc804ff746fb423d3 |