From 9df99caa4bac4cc627084ed1b5643a43326cf226 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 12 Jun 2018 12:31:49 +0000 Subject: tcwg-*: Re-generate dockerfiles. Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b --- xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile') diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile index 4534b5cc..7ea48035 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile @@ -1,9 +1,6 @@ # Auto generated from tcwg-base/tcwg-dev/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-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: 0e9607cbb3dd157d553ffebd26d6a411 +# checksum: af20c5a49f8dfcab4991049770e8aeaf -- cgit v1.2.3