From a1bf14c6deb19312d313ea365c1a420a1a34d6845eea1a4c8fbff50026df1a0e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 14 May 2020 21:23:40 +0000
Subject: [PATCH] Accepting request 805286 from devel:kubic

- Add registry.opensuse.org as default registry [bsc#1171578]

- Add /var/lib/ca-certificates/pem/SUSE.pem to the SLES mounts.
  This for making container-suseconnect working in the public
  cloud on-demand images. It needs that file for being able to
  verify the server certificates of the RMT servers hosted
  in the public cloud.
  (https://github.com/SUSE/container-suseconnect/issues/41)

OBS-URL: https://build.opensuse.org/request/show/805286
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=23
---
 libcontainers-common.changes | 15 +++++++++++++++
 libcontainers-common.spec    |  1 +
 registries.conf              |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index b2f856c..d116bd3 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed May 13 12:45:58 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- Add registry.opensuse.org as default registry [bsc#1171578] 
+
+-------------------------------------------------------------------
+Fri Apr 24 08:35:54 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>
+
+- Add /var/lib/ca-certificates/pem/SUSE.pem to the SLES mounts.
+  This for making container-suseconnect working in the public
+  cloud on-demand images. It needs that file for being able to
+  verify the server certificates of the RMT servers hosted
+  in the public cloud.
+  (https://github.com/SUSE/container-suseconnect/issues/41)
+  
 -------------------------------------------------------------------
 Fri Mar  6 11:14:24 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>
 
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index f5e5ad7..6d46e03 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -94,6 +94,7 @@ cd ..
 cat >>%{SOURCE5} <<EOL
 /etc/SUSEConnect:/etc/SUSEConnect
 /etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials
+/var/lib/ca-certificates/pem/SUSE.pem:/etc/pki/trust/anchors/SUSE.pem
 EOL
 %endif
 
diff --git a/registries.conf b/registries.conf
index a2527b4..4e63403 100644
--- a/registries.conf
+++ b/registries.conf
@@ -3,7 +3,7 @@
 # Registries to search for images that are not fully-qualified.
 # i.e. foobar.com/my_image:latest vs my_image:latest
 [registries.search]
-registries = ["docker.io"]
+registries = ["registry.opensuse.org", "docker.io"]
 
 # Registries that do not use TLS when pulling images or uses self-signed
 # certificates.