Merge pull request #24648 from mlaventure/fix-kill-test

Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
Upstream-commit: ffba13f43539ff58a0021c9353229507d50b66d5
Component: engine
This commit is contained in:
Arnaud Porterie
2016-07-19 18:24:34 +00:00
committed by GitHub
27 changed files with 1164 additions and 285 deletions
+1 -1
View File
@@ -200,7 +200,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install containerd
ENV CONTAINERD_COMMIT 1b3a81545ca79456086dc2aa424357be98b962ee
ENV CONTAINERD_COMMIT 90f827ca1066b3b6584ce7450989b96b576b1baf
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \