Browse code

use the Makefile - it makes life so much simpler

Sven Dowideit authored on 2013/12/02 16:59:45
Showing 1 changed files
... ...
@@ -15,8 +15,9 @@ set -e
15 15
 # - The script is intented to be run inside the docker container specified
16 16
 #   in the Dockerfile at the root of the source. In other words:
17 17
 #   DO NOT CALL THIS SCRIPT DIRECTLY.
18
-# - The right way to call this script is to invoke "docker build ." from
19
-#   your checkout of the Docker repository, and then
18
+# - The right way to call this script is to invoke "make" from
19
+#   your checkout of the Docker repository. 
20
+#   the Makefile will so a "docker build -t docker ." and then
20 21
 #   "docker run hack/make.sh" in the resulting container image.
21 22
 #
22 23
 
... ...
@@ -28,7 +29,7 @@ RESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
28 28
 grep -q "$RESOLVCONF" /proc/mounts || {
29 29
 	echo >&2 "# WARNING! I don't seem to be running in a docker container."
30 30
 	echo >&2 "# The result of this command might be an incorrect build, and will not be officially supported."
31
-	echo >&2 "# Try this: 'docker build -t docker . && docker run docker ./hack/make.sh'"
31
+	echo >&2 "# Try this: 'make all'"
32 32
 }
33 33
 
34 34
 # List of bundles to create when no argument is passed