Merge pull request #23132 from mlaventure/bump-to-1.11.2
Bump version to 1.11.2
diff --git a/Dockerfile b/Dockerfile
index a0fc78d..b6d152f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,10 +30,6 @@
|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
-# add llvm repo
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421 \
- || apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
-RUN echo deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main > /etc/apt/sources.list.d/llvm.list
# allow replacing httpredir mirror
ARG APT_MIRROR=httpredir.debian.org
@@ -49,7 +45,7 @@
bsdmainutils \
btrfs-tools \
build-essential \
- clang-3.8 \
+ clang \
createrepo \
curl \
dpkg-sig \
@@ -76,10 +72,7 @@
tar \
zip \
--no-install-recommends \
- && pip install awscli==1.10.15 \
- && ln -snf /usr/bin/clang-3.8 /usr/local/bin/clang \
- && ln -snf /usr/bin/clang++-3.8 /usr/local/bin/clang++
-
+ && pip install awscli==1.10.15
# Get lvm2 source for compiling statically
ENV LVM2_VERSION 2.02.103
RUN mkdir -p /usr/local/lvm2 \
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index d5434b1..626415d 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -153,7 +153,7 @@
VOLUME /var/lib/docker
WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
# Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc
diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
index 4f907ab..12ce0e1 100644
--- a/libcontainerd/remote_linux.go
+++ b/libcontainerd/remote_linux.go
@@ -349,7 +349,7 @@
}
// Start a new instance
- args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
+ args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc", "--start-timeout", "2m"}
if r.debugLog {
args = append(args, "--debug", "--metrics-interval=0")
}
