summaryrefslogtreecommitdiff
path: root/app-emulation/docker-registry
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /app-emulation/docker-registry
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'app-emulation/docker-registry')
-rw-r--r--app-emulation/docker-registry/Manifest1
-rw-r--r--app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch64
2 files changed, 0 insertions, 65 deletions
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index d55153d01ab9..3be58a6ccda5 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -1,4 +1,3 @@
-AUX docker-registry-2.6.1-notifications-expvar.patch 2360 BLAKE2B 15cf7bbc25503c6af51552ec18a8d585a5ae4e2b79ed385da01da568e79e5f68e6fbd4dfbbd5ed8a40ffc86a337b44fd78457658d28f57f76b081a4509c6ff6a SHA512 2a1aa8fd0f5df6380c8b0b11bdbc0c8f62c02cdbd87d1b697f691189c04409c71a69cf50e36704cb8b7c3c6040c88c77110076aae439aa9e173f95b4347dbc0a
AUX docker-registry-2.7.0-notification-metrics.patch 15565 BLAKE2B 31d3bc9d40c07939aca340d0c9bb516eb5afb9191f5d5d7c92b85f9f6dc8e1d86b659df337565eb09a0d08558ee50e1301734fcfa0449a920fcb332c00452c1a SHA512 a2161e5d2638f5682d70d900aba86cba3ca61ae99f7e325a5691c2cc4e5408f4a543c6204a05c19748494f1145e8468cf27e359ffad624fdac1e710974654e2c
AUX registry.confd 85 BLAKE2B 0997c1ad7ee8fc165a87cfebeea75694487c8d8b62130fb19fd4d9c55cc605754537deaea6e114a9fb28e46eb67bb6ab9d01de0971163acf22f223ca8ec84605 SHA512 7cbd19f545b659e2d295938b320710ae20b3c2222fcb6668216985c6e55bf51647041dec1c33ab7271e464f13001d8095fef9240d3390cff7e65028d3432c4f4
AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8930d61f233248b7364659a8db5a9800eaa167d76a8b2daf9d121970622de235e61fa0f10ad85174 SHA512 af7780264d068adcd0d6a6768b88ab43c26081b71d1ebd591ca6d175e413cdeee935a6f50d9833775690f0b47daadcc33286f86fb5eb98d2e674b225122aabce
diff --git a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch b/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
deleted file mode 100644
index 1d40edf1f0cd..000000000000
--- a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9a58c91051e03b46f1461e371a7bf527c1284612 Mon Sep 17 00:00:00 2001
-From: Noah Treuhaft <noah.treuhaft@docker.com>
-Date: Wed, 8 Feb 2017 11:38:44 -0800
-Subject: [PATCH] notifications: fix expvar for Go 1.7
-
-Remove EndpointConfig.Transport from the return value of the
-registry.notifications.endpoints expvar.Func. It results in an empty
-value for that expvar variable under Go 1.7 because it is a non-nil
-*http.Transport, which Go 1.7 can no longer encode as JSON.
-
-Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com>
----
- notifications/endpoint.go | 2 +-
- notifications/metrics_test.go | 28 ++++++++++++++++++++++++++++
- 2 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 notifications/metrics_test.go
-
-diff --git a/src/github.com/docker/distribution/notifications/endpoint.go b/src/github.com/docker/distribution/notifications/endpoint.go
-index 29a9e27b5..44d0f6d7b 100644
---- a/src/github.com/docker/distribution/notifications/endpoint.go
-+++ b/src/github.com/docker/distribution/notifications/endpoint.go
-@@ -13,7 +13,7 @@ type EndpointConfig struct {
- Threshold int
- Backoff time.Duration
- IgnoredMediaTypes []string
-- Transport *http.Transport
-+ Transport *http.Transport `json:"-"`
- }
-
- // defaults set any zero-valued fields to a reasonable default.
-diff --git a/src/github.com/docker/distribution/notifications/metrics_test.go b/src/github.com/docker/distribution/notifications/metrics_test.go
-new file mode 100644
-index 000000000..03a08e2c8
---- /dev/null
-+++ b/notifications/metrics_test.go
-@@ -0,0 +1,28 @@
-+package notifications
-+
-+import (
-+ "encoding/json"
-+ "expvar"
-+ "testing"
-+)
-+
-+func TestMetricsExpvar(t *testing.T) {
-+ endpointsVar := expvar.Get("registry").(*expvar.Map).Get("notifications").(*expvar.Map).Get("endpoints")
-+
-+ var v interface{}
-+ if err := json.Unmarshal([]byte(endpointsVar.String()), &v); err != nil {
-+ t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+ }
-+ if v != nil {
-+ t.Fatalf("expected nil, got %#v", v)
-+ }
-+
-+ NewEndpoint("x", "y", EndpointConfig{})
-+
-+ if err := json.Unmarshal([]byte(endpointsVar.String()), &v); err != nil {
-+ t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+ }
-+ if slice, ok := v.([]interface{}); !ok || len(slice) != 1 {
-+ t.Logf("expected one-element []interface{}, got %#v", v)
-+ }
-+}