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 /xenial-armhf-tcwg-base | |
parent | b816fde223eacfd43da4d30d20d268f1a03a19db (diff) |
tcwg-*: Re-generate dockerfiles.
Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b
Diffstat (limited to 'xenial-armhf-tcwg-base')
-rw-r--r-- | xenial-armhf-tcwg-base/Dockerfile | 7 | ||||
-rw-r--r-- | xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile | 12 | ||||
-rw-r--r-- | xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile | 11 |
3 files changed, 14 insertions, 16 deletions
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile index 1af411a7..21856d38 100644 --- a/xenial-armhf-tcwg-base/Dockerfile +++ b/xenial-armhf-tcwg-base/Dockerfile @@ -102,6 +102,11 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +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" @@ -111,4 +116,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 92189d9c279c853a1bd178c6fa25d8ae +# checksum: 716d3271c635801055ab84e8eeed3770 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index c8fa79c1..61718983 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile @@ -1,15 +1,11 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-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 -# checksum: 43e48ac069d20747286d7172a99b0552 +# checksum: c815138e51130526b39402332535d2e5 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile index 1bbdba71..52fdb594 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile @@ -1,9 +1,6 @@ # Auto generated from tcwg-base/tcwg-dev/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-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: ece1982cfb0a9675f6cb4af314a31779 +# checksum: 86ef26614d9556c57c42136f4cf5b87f |