diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-02-24 16:04:11 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-02-24 16:04:11 +0000 |
| commit | 530f51158b53879ee2256ff592d3c7adef9858d5 (patch) | |
| tree | 3ccdc9aa563b69efdcf6f864426a3413f92d381c /trusty-i386-tcwg-base | |
| parent | 2b9c602ff00843457eba12f2ba1b78193c76f778 (diff) | |
*-tcwg-base: Add docker.io package to have docker client
... except for trusty-arm64-tcwg-base, which doesn't have docker.io.
Change-Id: I9e0206d7a00d4ee6e322078ce96ea405a595780c
Diffstat (limited to 'trusty-i386-tcwg-base')
| -rw-r--r-- | trusty-i386-tcwg-base/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index e1f133d1..319c4cd3 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -22,6 +22,7 @@ RUN echo 'deb http://archive.ubuntu.com/ubuntu trusty main universe' > /etc/apt/ dh-autoreconf \ dh-translations \ distro-info-data \ + docker.io \ emacs \ fakeroot \ flex \ @@ -77,7 +78,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxSessions 256" >> /etc/ssh/sshd_config # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, -# which docker is using can't host sockets, so we use a scratch mount +# 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" # invocations (e.g., mark "Remove volumes" checkbox in docker plugin) to # cleanup host directories used for the scratch mounts. |