1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Revert tasksmax workaround to avoid unsupported bins

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
This commit is contained in:
Stefan Scherer 2016-06-29 08:10:10 +02:00
parent 91fd0df9c0
commit 6509cc4e63
No known key found for this signature in database
GPG key ID: 5966AEAC37E957FA

View file

@ -90,16 +90,6 @@ set -e
cat >> "$DEST/$version/Dockerfile.build" <<-EOF cat >> "$DEST/$version/Dockerfile.build" <<-EOF
RUN cp -aL hack/make/.build-deb debian 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 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 RUN dpkg-buildpackage -uc -us -I.git
EOF EOF
tempImage="docker-temp/build-deb:$version" tempImage="docker-temp/build-deb:$version"