toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert tasksmax workaround to avoid unsupported bins

Browse Source 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 6509cc4e63f50661f6563f45153b23599cc6665c
Component: engine
This commit is contained in:
Stefan Scherer
2016-06-29 08:10:10 +02:00
parent f2f73c4b53
commit c6d459baa5
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/make/build-deb
-10
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"