Fixing make image to run on OSX (#5027)

* Fixing `make image` to run on OSX

* Set the GOPATH if it's unset

* Use whichever bash is on the path rather than hardcoding to /bin

.dockerignore

@@ -0,0 +1,3 @@
+/contrib
+/wiki
+/.git

Makefile

@@ -58,13 +58,12 @@ test:
 	@echo Running ./test.sh
 	./test.sh
 
-image: dgraph
+image:
+	@GOOS=linux $(MAKE) dgraph
 	@mkdir linux
 	@mv ./dgraph/dgraph ./linux/dgraph
-	@cp ./contrib/Dockerfile .
-	@docker build -t dgraph/dgraph:$(subst /,-,${BUILD_BRANCH}) .
+	@docker build -f contrib/Dockerfile -t dgraph/dgraph:$(subst /,-,${BUILD_BRANCH}) .
 	@rm -r linux
-	@rm Dockerfile
 
 help:
 	@echo

contrib/scripts/functions.sh

@@ -22,7 +22,7 @@ function restartCluster {
     make install
   fi
   docker ps -a --filter label="cluster=test" --format "{{.Names}}" | xargs -r docker rm -f
-  docker-compose -p dgraph -f $compose_file up --force-recreate --remove-orphans --detach || exit 1
+  GOPATH="${GOPATH:-$(go env GOPATH)}" docker-compose -p dgraph -f $compose_file up --force-recreate --remove-orphans --detach || exit 1
   popd >/dev/null
 
   $basedir/contrib/wait-for-it.sh -t 60 localhost:6180 || exit 1

test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # usage: test.sh [pkg_regex]