pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 659068 from home:cyphar:go:remove_goroot_profile

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/659068
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=275
This commit is contained in:
Aleksa Sarai 2018-12-18 10:34:21 +00:00 committed by Git OBS Bridge
parent 1d3bce0fc6
commit c63069dadd
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -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> Mon Dec 3 16:14:22 UTC 2018 - Aleksa Sarai <asarai@suse.com>

10
docker.spec
View File

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