tcwg-*: Re-generate dockerfiles.

Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b

4 files changed, 17 insertions, 23 deletions

diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index a7834cf6..060f0e58 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -116,6 +116,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"
@@ -125,4 +130,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 076425a20c7afb989affdede4481c722
+# checksum: e837e40e5e63b791c76cf9d24d64ea9e
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
index ab027d2b..42b8d8d1 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
@@ -1,16 +1,12 @@
 # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
 FROM linaro/ci-amd64-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).
@@ -24,4 +20,4 @@ RUN \
  /var/lib/apt/lists/* \
  /tmp/* \
  /var/tmp/*
-# checksum: 396ee316c32bc04ca8db0d76bf4f4948
+# checksum: 5ec4314bb47180f2d9b6430d56a1292f
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
index 618500ac..6ee6609f 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile
@@ -1,9 +1,6 @@
 # Auto generated from tcwg-base/tcwg-dev/Dockerfile.in. Do not edit.
 FROM linaro/ci-amd64-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 ["/run.sh"]
 CMD ["start.sh"]
-# checksum: dcc5804aedae03114b28d305dcbc2904
+# checksum: ce97ce5f929251c1dd59473d63aa00c0
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
index 262f9644..2e2eaf28 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile
@@ -1,13 +1,9 @@
 # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit.
 FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
 
-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" --home-data /home-data; \
+RUN while read line; do \
+      new-user.sh --passwd "$line"; \
     done </home-data/passwd
 
 COPY start.sh /
-# checksum: 67be8ad2fe441805f3c2f1c7a8c1ef99
+# checksum: cd5ca50ee428e59198a461af6f57d237