forked from pool/docker
d470da093f
- use gcc6-go instead of gcc5-go (bsc#988408)
- build ppc64le with gc-go because this version builds with gc-go 1.6
- remove bnc964673-boltdb-metadata-recovery.patch because it has already
been merged
- update to v1.12.0 (bsc#995058)
see detailed changelog at
https://github.com/docker/docker/releases/tag/v1.12.0
- disable test that fail in obs build context
- only run unit tests on architectures that provide the go list and go test
tools
- disable dockerd, parser, integration test, and devicemapper related tests
on versions below SLE12 and openSUSE_13.2
- bump test timeout to 10m (for aarch64)
- run unit tests during the build
- Adapt docker.service file.
- adapt install sections for gccgo builds: gccgo build are not built in separate
folders for client and daemon. They both reside in dyngccgo.
- gcc-go-patch: link against systemd when compiling the daemon.
- Add disable-pprof-trace.patch
pprof.Trace() is not available in go version <= 1.4 which we use to build SLES
packages. This patch comments out the pprof.Trace() section.
- update gcc-go-patch and docker-mount-secrets.patch
- Fixed binary split, install both required binaries correctly
OBS-URL: https://build.opensuse.org/request/show/421307
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=127
15 lines
693 B
Diff
15 lines
693 B
Diff
diff --git a/api/server/profiler.go b/api/server/profiler.go
|
|
index 8bf8384..c062f2d 100644
|
|
--- a/api/server/profiler.go
|
|
+++ b/api/server/profiler.go
|
|
@@ -18,7 +18,8 @@ func profilerSetup(mainRouter *mux.Router) {
|
|
r.HandleFunc("/pprof/cmdline", pprof.Cmdline)
|
|
r.HandleFunc("/pprof/profile", pprof.Profile)
|
|
r.HandleFunc("/pprof/symbol", pprof.Symbol)
|
|
- r.HandleFunc("/pprof/trace", pprof.Trace)
|
|
+ // pprof.Trace is not available in go <= 1.4
|
|
+ // r.HandleFunc("/pprof/trace", pprof.Trace)
|
|
r.HandleFunc("/pprof/block", pprof.Handler("block").ServeHTTP)
|
|
r.HandleFunc("/pprof/heap", pprof.Handler("heap").ServeHTTP)
|
|
r.HandleFunc("/pprof/goroutine", pprof.Handler("goroutine").ServeHTTP)
|