kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628 

Revert tasksmax workaround to avoid unsupported bins
This commit is contained in:
Sebastiaan van Stijn 2016-06-30 13:20:33 -07:00 committed by GitHub
parent 3926d98394 6509cc4e63
commit 295a6a37dc
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/make/build-deb
View File

@ -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"