diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-12 12:31:49 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-12 12:31:49 +0000 |
| commit | 9df99caa4bac4cc627084ed1b5643a43326cf226 (patch) | |
| tree | 3afbd5e29e892a42e3afd6190f95721ff90b0153 /trusty-i386-tcwg-base | |
| parent | b816fde223eacfd43da4d30d20d268f1a03a19db (diff) | |
tcwg-*: Re-generate dockerfiles.
Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b
Diffstat (limited to 'trusty-i386-tcwg-base')
| -rw-r--r-- | trusty-i386-tcwg-base/Dockerfile | 7 | ||||
| -rw-r--r-- | trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index c544aa31..13b00a3c 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -118,6 +118,11 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -127,4 +132,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 85fc2b97a1844f16773e68faa51640f1 +# checksum: 6bbf6405eba4b5fb4f754465d9c1748f diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index 82a990af..c5a14d34 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -1,16 +1,12 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-i386-tcwg-base-ubuntu:trusty -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN 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/ + new-user.sh --passwd "$line"; \ + done </home-data/passwd # 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). @@ -23,4 +19,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 15e8b16ded4fbd3a0f8395195664b61f +# checksum: 05747b8e543f8061bcbfb8136b6d852b |