@@ -29,11 +29,22 @@ export MAKEDIR="$SCRIPTDIR/make"

 # 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!

-if [ "$PWD" != "/go/src/$DOCKER_PKG" ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then

+inContainer="AssumeSoInitially"

+if [ "$(go env GOHOSTOS)" = 'windows' ]; then

+	if [ -n "$FROM_DOCKERFILE" ]; then

+		unset inContainer

+	fi

+else

+	if [ "$PWD" != "/go/src/$DOCKER_PKG" ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then

+		unset inContainer

+	fi

+fi

+

+if [ -n "$inContainer" ]; then

 	{

-		echo "# WARNING! I don't seem to be running in the Docker container."

+		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"

-		echo "#   officially supported."

+		echo "# officially supported."

 		echo "#"

 		echo "# Try this instead: make all"

 		echo "#"