hack/make.sh print a warning but don't exit if called outside a correct build environment.

Upstream-commit: ebee8f28ac45e7907a35331383f8b9b4ab338353
Component: engine
This commit is contained in:
Solomon Hykes
2013-09-10 18:08:02 -07:00
parent ed8387023e
commit 7ba861bda7

View File

@ -25,10 +25,9 @@ set -e
# but really, they shouldn't. We want to be in a container!
RESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
grep -q "$RESOLVCONF" /proc/mounts || {
echo "# I will only run within a container."
echo "# Try this instead:"
echo "docker build ."
exit 1
echo "# WARNING! I don't seem to be running in a docker container.
echo "# The result of this command might be an incorrect build, and will not be officially supported."
echo "# Try this: 'docker build -t docker . && docker run docker ./hack/make.sh'
}
# List of bundles to create when no argument is passed