From 0b7d02b0d907d87a7b55e67b3e6fa762cd1e3b28 Mon Sep 17 00:00:00 2001 From: Christy Perez Date: Tue, 29 Mar 2016 12:30:53 -0500 Subject: [PATCH] Build-deb hack for systemd tasksmax Since we can't use the TasksMax value in the docker.service file by default, we can uncomment it at buildtime. See docker/docker/pull/21491 for some background. Signed-off-by: Christy Perez Upstream-commit: 2b849e0263576a818fafd73ba0467633db3bb6cb Component: engine --- components/engine/hack/make/build-deb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/engine/hack/make/build-deb b/components/engine/hack/make/build-deb index 2e7d2de402..102d5351d2 100644 --- a/components/engine/hack/make/build-deb +++ b/components/engine/hack/make/build-deb @@ -86,6 +86,16 @@ set -e cat >> "$DEST/$version/Dockerfile.build" <<-EOF RUN cp -aL hack/make/.build-deb debian RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog + EOF + # Remove the following case-based substitution when none of these are supported, and the TasksMax value is uncommented in docker.service + case "$version" in + debian-jessie|debian-wheezy|ubuntu-precise|ubuntu-trusty|ubuntu-wily) + ;; + *) + echo "RUN sed -i -- 's/#TasksMax=infinity/TasksMax=infinity/' contrib/init/systemd/docker.service" >> "$DEST/$version/Dockerfile.build" + ;; + esac + cat >> "$DEST/$version/Dockerfile.build" <<-EOF RUN dpkg-buildpackage -uc -us EOF tempImage="docker-temp/build-deb:$version"