Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcontainers-common for
openSUSE:Factory checked in at 2024-05-05 12:10:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Sun May 5 12:10:34 2024 rev:71 rq:1171527 version:20240408
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2024-04-14 11:53:54.745890852 +0200
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.1880/libcontainers-common.changes
2024-05-05 12:10:52.120057022 +0200
@@ -1,0 +2,7 @@
+Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prak...@suse.com>
+
+- Introduce new subpackage that ships registries.conf that uses
+ registry.suse.com as the only unqualified registry while pulling images on
+ SL Micro and SP6. (jsc#SMO-376, jsc#PED-8289)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.m374Od/_old 2024-05-05 12:10:52.896085107 +0200
+++ /var/tmp/diff_new_pack.m374Od/_new 2024-05-05 12:10:52.896085107 +0200
@@ -58,6 +58,12 @@
Requires: (libcontainers-sles-mounts if (product(SUSE_SLE) or
product(SLE-Micro)))
Requires: libcontainers-policy >= %{version}
Suggests: (libcontainers-policy-openSUSE if openSUSE-release)
+# Default to SUSE registry on SL Micro,
+# keep SUSE, openSUSE and dockerhub registries otherwise.
+# (jsc#SMO-376, jsc#PED-8289)
+Requires: registries-conf >= %{version}
+Suggests: (registries-conf-suse if (product(SL-Micro) or
(product(SUSE_SLE) >= 15.5)))
+Suggests: (registries-conf-default if openSUSE-release)
Provides: libcontainers-image = %{version}
Provides: libcontainers-storage = %{version}
Obsoletes: libcontainers-image < %{version}
@@ -72,7 +78,7 @@
Summary: Default mounts for SLE distributions
%description -n libcontainers-sles-mounts
-Updates /etc/containers/mounts.conf with default mounts for SLE distributions
+Ships a /etc/containers/mounts.conf with default mounts for SLE distributions
%package -n libcontainers-openSUSE-policy
Summary: Policy to enforce image verification for SLE BCI
@@ -94,6 +100,24 @@
%description -n libcontainers-default-policy
This package ships the default /etc/containers/policy.json
+%package -n registries-conf-suse
+Summary: Defaults to SUSE Registry on SL Micro
+Provides: registries-conf = %{version}-%{release}
+RemovePathPostfixes: .suse
+Conflicts: registries-conf-default
+
+%description -n registries-conf-suse
+Ships a modified registries.conf with registry.suse.com as the only
unqualified search registry.
+
+%package -n registries-conf-default
+Summary: Add SUSE and openSUSE registries to be used to pull
images along with dockerhub
+Provides: registries-conf = %{version}-%{release}
+RemovePathPostfixes: .default
+Conflicts: registries-conf-suse
+
+%description -n registries-conf-default
+Ships the upstream registries.conf with registry.opensuse.org and
registry.suse.com as additional unqualified search registries.
+
%prep
cp %{SOURCE9} .
# Apply CNI config on streams other than ALP (bsc#1213556)
@@ -139,6 +163,9 @@
%{_sysconfdir}/zypp/credentials.d/SCCcredentials:%{_sysconfdir}/zypp/credentials.d/SCCcredentials
EOL
+# Default to SUSE registry on SL Micro
+sed 's/unqualified-search-registries.*/unqualified-search-registries =
\["registry.suse.com"\]/' %{SOURCE6} > registries.conf.suse
+
cd common-%{commonver}
%make_build docs
cd ..
@@ -158,7 +185,6 @@
install -D -m 0644 %{SOURCE4}
%{buildroot}/%{_sysconfdir}/containers/storage.conf
install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
install -D -m 0644 %{SOURCE5}
%{buildroot}/%{_sysconfdir}/containers/mounts.conf
-install -D -m 0644 %{SOURCE6}
%{buildroot}/%{_sysconfdir}/containers/registries.conf
install -D -m 0644 %{SOURCE11}
%{buildroot}/%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
install -D -m 0644 %{SOURCE7}
%{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
install -D -m 0644 %_builddir/containers.conf
%{buildroot}/%{_datadir}/containers/containers.conf
@@ -178,6 +204,9 @@
install -D -m 0644 %{SOURCE12}
%{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE
install -D -m 0644 %{SOURCE3}
%{buildroot}/%{_sysconfdir}/containers/policy.json.default
+install -D -m 0644 %{SOURCE6}
%{buildroot}/%{_sysconfdir}/containers/registries.conf.default
+install -D -m 0644 registries.conf.suse
%{buildroot}/%{_sysconfdir}/containers/registries.conf.suse
+
%post
# Comment out ostree_repo if it's blank [boo#1189893]
sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g'
%{_sysconfdir}/containers/storage.conf
@@ -195,7 +224,6 @@
%dir %{_datadir}/containers/systemd
%config(noreplace) %{_sysconfdir}/containers/storage.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/seccomp.json
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
%config(noreplace)
%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
@@ -216,3 +244,9 @@
%files -n libcontainers-default-policy
%config(noreplace) %{_sysconfdir}/containers/policy.json.default
+%files -n registries-conf-suse
+%config(noreplace) %{_sysconfdir}/containers/registries.conf.suse
+
+%files -n registries-conf-default
+%config(noreplace) %{_sysconfdir}/containers/registries.conf.default
+
