rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 422125 from home:jordimassaguerpla:branch:V:c:remove_patch_add_tests

Browse Source 
- remove disable-pprof-trace.patch: We can remove this patch because
  we use go 1.6, either gcc6-go or gc-go. This patch was for gcc5-go

OBS-URL: https://build.opensuse.org/request/show/422125
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=131
This commit is contained in:
Christian Brauner 2016-08-25 14:14:03 +00:00 committed by Git OBS Bridge
parent 4382c45dde
commit d227abc5a1
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
disable-pprof-trace.patch
View File

@ -1,14 +0,0 @@
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)

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 25 14:02:04 UTC 2016 - jmassaguerpla@suse.com
- remove disable-pprof-trace.patch: We can remove this patch because
we use go 1.6, either gcc6-go or gc-go. This patch was for gcc5-go
-------------------------------------------------------------------
Wed Aug 24 12:31:23 UTC 2016 - jmassaguerpla@suse.com

2
docker.spec
View File

@ -63,7 +63,6 @@ Source9: docker-update-message.txt
Patch100: gcc-go-patches.patch
Patch101: netlink_gcc_go.patch
Patch102: netlink_netns_powerpc.patch
Patch103: disable-pprof-trace.patch
Patch200: docker-mount-secrets.patch
BuildRequires: audit
BuildRequires: bash-completion
@ -178,7 +177,6 @@ Test package for docker. It contains the source code and the tests.
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%endif
cp %{SOURCE7} .