diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-10 16:42:06 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-08-10 16:42:13 +0000 |
| commit | 6e3975d175a8b395efef4d374fa3c963c497fc40 (patch) | |
| tree | 6fae5326868ad6d456ec9d2891ddd300419c2764 /xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile | |
| parent | 0d3d218cb7820c85f4f4bc2289dae04f05846eb6 (diff) | |
| parent | 4987643128451853122837b70d5797400ff45a65 (diff) | |
Merge commit '4987643128451853122837b70d5797400ff45a65' into tcwg-llvmprod
Change-Id: I4843c9c752c139339aff8cb744742769bf327bf2
Diffstat (limited to 'xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile')
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile | 11 |
1 files changed, 4 insertions, 7 deletions
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 |