Hello community,
here is the log from the commit of package docker-kubic for openSUSE:Factory checked in at 2018-04-05 15:32:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-kubic (Old)
and /work/SRC/openSUSE:Factory/.docker-kubic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-kubic"
Thu Apr 5 15:32:11 2018 rev:5 rq:593373 version:17.09.1_ce
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-kubic/docker-kubic.changes 2018-02-18 11:42:01.486332170 +0100
+++ /work/SRC/openSUSE:Factory/.docker-kubic.new/docker-kubic.changes 2018-04-05 15:32:15.274825056 +0200
@@ -1,0 +2,6 @@
+Thu Mar 8 13:14:54 UTC 2018 - vrothberg@suse.com
+
+- Fix private-registry-0001-Add-private-registry-mirror-support.patch to
+ deal corretly with TLS configs of 3rd party registries.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ private-registry-0001-Add-private-registry-mirror-support.patch ++++++
--- /var/tmp/diff_new_pack.ro90ca/_old 2018-04-05 15:32:16.182792239 +0200
+++ /var/tmp/diff_new_pack.ro90ca/_new 2018-04-05 15:32:16.182792239 +0200
@@ -1,4 +1,4 @@
-From b3fcbddfa87f116dc4efecd8aea3803872153246 Mon Sep 17 00:00:00 2001
+From a3149e952185fae041c68fa90013f4fdd4b68f8a Mon Sep 17 00:00:00 2001
From: Valentin Rothberg
Date: Tue, 23 Jan 2018 10:41:31 +0100
Subject: [PATCH] Add private-registry mirror support
@@ -77,8 +77,8 @@
components/engine/registry/config_test.go | 138 ++++++++++++++++++++
components/engine/registry/registry_test.go | 102 +++++++++++++--
components/engine/registry/service.go | 56 +++++---
- components/engine/registry/service_v2.go | 69 +++++++---
- 15 files changed, 728 insertions(+), 58 deletions(-)
+ components/engine/registry/service_v2.go | 77 ++++++++---
+ 15 files changed, 736 insertions(+), 58 deletions(-)
diff --git a/components/engine/api/types/registry/registry.go b/components/engine/api/types/registry/registry.go
index b98a943a1323..669cc415a6a4 100644
@@ -1132,10 +1132,10 @@
if err != nil {
return nil, err
diff --git a/components/engine/registry/service_v2.go b/components/engine/registry/service_v2.go
-index 68466f823f41..53fe76222180 100644
+index 68466f823f41..bd8a4a937151 100644
--- a/components/engine/registry/service_v2.go
+++ b/components/engine/registry/service_v2.go
-@@ -1,46 +1,75 @@
+@@ -1,46 +1,83 @@
package registry
import (
@@ -1217,6 +1217,14 @@
+ Host: reg.URL.Host(),
+ }
+ }
++ // create new TLS config for 3rd party registries
++ if !official {
++ var err error
++ tlsConfig, err = s.tlsConfig(endpointURL.Host)
++ if err != nil {
++ return nil, fmt.Errorf("[lookupV2Endpoints] %s", err)
++ }
++ }
endpoints = append(endpoints, APIEndpoint{
- URL: DefaultV2Registry,
+ URL: endpointURL,
@@ -1230,7 +1238,7 @@
return endpoints, nil
}
-@@ -48,7 +77,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp
+@@ -48,7 +85,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp
tlsConfig, err = s.tlsConfig(hostname)
if err != nil {
@@ -1240,5 +1248,5 @@
endpoints = []APIEndpoint{
--
-2.16.1
+2.13.6