Accepting request 659073 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/659073
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=84

docker.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 18 10:10:06 UTC 2018 - Aleksa Sarai <asarai@suse.com>
+
+- Handle build breakage due to missing 'export GOPATH' (caused by resolution of
+  boo#1119634). I believe Docker is one of the only packages with this problem.
+
 -------------------------------------------------------------------
 Mon Dec  3 16:14:22 UTC 2018 - Aleksa Sarai <asarai@suse.com>
 

docker.spec

@@ -314,10 +314,10 @@ EOF
 # Preparing GOPATH so that the client is visible to the compiler
 mkdir -p src/github.com/docker/
 ln -s $(pwd)/components/cli $(pwd)/src/github.com/docker/cli
-GOPATH=$GOPATH:$(pwd)
+export GOPATH=$GOPATH:$(pwd)
 
 # DOCKER ENGINE
-cd components/engine/
+pushd components/engine/
 # ignore the warning that we compile outside a Docker container
 ./hack/make.sh dynbinary
 # build the tests binary
@@ -325,17 +325,17 @@ GOPATH=$(pwd)/vendor:$(pwd)/.gopath/ go test \
 	-buildmode=pie \
 	-tags "$DOCKER_BUILDTAGS daemon autogen" \
 	-c github.com/docker/docker/integration-cli -o tests.main
-cd ../..
+popd
 
 # DOCKER CLIENT
-cd components/cli
+pushd components/cli
 ./scripts/build/dynbinary
 
 mkdir -p ./man/man1
 go build -buildmode=pie -o gen-manpages github.com/docker/cli/man
 ./gen-manpages --root "$(pwd)" --target "$(pwd)/man/man1"
 ./man/md2man-all.sh
-cd ../..
+popd
 
 %check
 # We used to run 'go test' here, however we found that this actually didn't