Browse code

Merge pull request #39604 from seemethere/in_container_question_mark

hack: Remove inContainer check, it wasn't useful

Tianon Gravi authored on 2019/08/28 08:10:47
Showing 1 changed files
... ...
@@ -28,30 +28,6 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
28 28
 export MAKEDIR="$SCRIPTDIR/make"
29 29
 export PKG_CONFIG=${PKG_CONFIG:-pkg-config}
30 30
 
31
-# We're a nice, sexy, little shell script, and people might try to run us;
32
-# but really, they shouldn't. We want to be in a container!
33
-inContainer="AssumeSoInitially"
34
-if [ "$(go env GOHOSTOS)" = 'windows' ]; then
35
-	if [ -z "$FROM_DOCKERFILE" ]; then
36
-		unset inContainer
37
-	fi
38
-else
39
-	if [ "$PWD" != "/go/src/$DOCKER_PKG" ]; then
40
-		unset inContainer
41
-	fi
42
-fi
43
-
44
-if [ -z "$inContainer" ]; then
45
-	{
46
-		echo "# WARNING! I don't seem to be running in a Docker container."
47
-		echo "# The result of this command might be an incorrect build, and will not be"
48
-		echo "# officially supported."
49
-		echo "#"
50
-		echo "# Try this instead: make all"
51
-		echo "#"
52
-	} >&2
53
-fi
54
-
55 31
 echo
56 32
 
57 33
 # List of bundles to create when no argument is passed