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

Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check 

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-01-24 23:01:12 -07:00
parent e6ae8f6d21
commit b994c13159
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hack/make.sh
View File

@ -25,12 +25,18 @@ set -o pipefail
# We're a nice, sexy, little shell script, and people might try to run us; # We're a nice, sexy, little shell script, and people might try to run us;
# but really, they shouldn't. We want to be in a container! # but really, they shouldn't. We want to be in a container!
RESOLVCONF=$(readlink --canonicalize /etc/resolv.conf) if [ "$(pwd)" != '/go/src/github.com/dotcloud/docker' ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then
grep -q "$RESOLVCONF" /proc/mounts || { {
echo >&2 "# WARNING! I don't seem to be running in a docker container." echo "# WARNING! I don't seem to be running in the Docker container."
echo >&2 "# The result of this command might be an incorrect build, and will not be officially supported." echo "# The result of this command might be an incorrect build, and will not be"
echo >&2 "# Try this: 'make all'" echo "# officially supported."
} echo "#"
echo "# Try this instead: make all"
echo "#"
} >&2
fi
echo
# List of bundles to create when no argument is passed # List of bundles to create when no argument is passed
DEFAULT_BUNDLES=( DEFAULT_BUNDLES=(