tcwg-*: Re-generate dockerfiles.

Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b

3 files changed, 14 insertions, 16 deletions

diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index 6326e08d..5188aa3a 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-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: c5b2ed5703c19113f8da87c5912480f3
+# checksum: ba4a5e00f5a4698fad526fe3f538b798
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
index a7126f0e..101688c0 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-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:xenial
 
-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: f882d18e6d6d594bc1e3affae37e9cf5
+# checksum: 187d9beb3498e962ef96cdc3ca97a938
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
index d0603797..16b67a8d 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile
@@ -1,9 +1,6 @@
 # Auto generated from tcwg-base/tcwg-dev/Dockerfile.in. Do not edit.
 FROM linaro/ci-i386-tcwg-base-ubuntu:xenial
 
-COPY run.sh .
-COPY start.sh .
-
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  software-properties-common \
@@ -35,15 +32,15 @@ RUN apt-get update \
  /tmp/* \
  /var/tmp/*
 
-RUN sed -i -e '/.*AuthorizedKeysFile/ d' /etc/ssh/sshd_config \
- && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.docker" >> /etc/ssh/sshd_config \
- && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \
+RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \
  && apt-file update
 
 # Create directories required for X11.
 RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \
  && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix
 
+COPY run.sh start.sh /
+
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: d4713d03be137a74e7d172adec5fd118
+# checksum: f4c0c13056527d2caf20e2e2682098c0