toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21592 from anusha-ragunathan/docker-systemd

Browse Source 
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
This commit is contained in:
David Calavera
2016-03-29 17:00:10 -07:00
parent 078c5f91c2 3b9321568d
commit 5888c28b47
13 changed files with 92 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/Dockerfile
View File

@ -247,7 +247,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install runc
ENV RUNC_COMMIT d563bd134293c1026976a8f5764d5df5612f1dbf
ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
@ -257,7 +257,7 @@ RUN set -x \
&& cp runc /usr/local/bin/docker-runc
# Install containerd
ENV CONTAINERD_COMMIT c761085e92be09df9d5298f852c328b538f5dc2f
ENV CONTAINERD_COMMIT 471bb075214cf0ad85f74f003ca00c7651638c79
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \