From 6509cc4e63f50661f6563f45153b23599cc6665c Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 29 Jun 2016 08:10:10 +0200 Subject: [PATCH] Revert tasksmax workaround to avoid unsupported bins Signed-off-by: Stefan Scherer --- hack/make/build-deb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hack/make/build-deb b/hack/make/build-deb index 2aed66fcb6..4470913c70 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -90,16 +90,6 @@ 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 -I.git EOF tempImage="docker-temp/build-deb:$version"