diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-05 13:21:24 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-05 13:28:23 +0000 |
| commit | 06e335a7030b3270303363ea97a621badc1f10ae (patch) | |
| tree | 72d631eb5f8b8f79dbdf0723ca8dd921513a0d55 /xenial-amd64-tcwg-base | |
| parent | 5f4811ff114af8cf612efd897103401dc1b0f2a8 (diff) | |
tcwg-host, tcwg-build: Simplify and unify handling of /home files
Replace "new-user.sh --key KEY" interface with "new-user.sh --home-data DIR"
interface. Use the new interface in both tcwg-host and tcwg-build images.
Change-Id: I58e7e6506daa70bd10b4f29deebcf85ca0c5bc4f
Diffstat (limited to 'xenial-amd64-tcwg-base')
| -rw-r--r-- | xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile | 18 | ||||
| -rw-r--r-- | xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 9 |
2 files changed, 9 insertions, 18 deletions
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 62ca534d..e8f026c0 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -1,19 +1,15 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial +COPY tcwg-buildslave /home-data/tcwg-buildslave +COPY tcwg-benchmark /home-data/tcwg-benchmark + RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ - && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ + && 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 \ + && rm -rf /home-data/ \ && mkdir -p /home/tcwg-buildslave/workspace -COPY tcwg-buildslave /home/tcwg-buildslave -COPY tcwg-benchmark /home/tcwg-benchmark - -RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \ - && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \ - && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \ - && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/* - # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). RUN \ @@ -26,4 +22,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: cb3df93de0a1a7b466665316a38399de +# checksum: 32efda3903352f4752d6cbc26a1666b6 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index 4032b4b7..2474158c 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -6,12 +6,7 @@ COPY home-data/ /home-data/ RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \ && while read line; do \ - new-user.sh --passwd "$line"; \ - user=$(echo "$line" | cut -d: -f 1); \ - gid=$(echo "$line" | cut -d: -f 4); \ - chown -R $user:$gid /home-data/$user/; \ - chmod -R go-rwx /home-data/$user/.ssh/ ; \ - rsync -a /home-data/$user/ /home/$user/; \ + new-user.sh --passwd "$line" --home-data /home-data; \ done </passwd \ && rm -rf /passwd /home-data/ -# checksum: 8addecd7fe9e1dbba206ef27074748d7 +# checksum: e22424698f84f6b617398c9d79f141ed |