From 7aa566c44d54e59d2ab5798ab01189468e4e632d3a76276fd8deb47eec0b1aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 06:59:22 +0000 Subject: [PATCH 1/5] Accepting request 1170171 from home:danishprakash:branches:devel:microos Introduce new subpackage that ships registries.conf which uses registry.suse.com as the only unqualified registry while pulling images on SL Micro. (SMO-376) OBS-URL: https://build.opensuse.org/request/show/1170171 OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=35 --- libcontainers-common.changes | 7 +++++++ libcontainers-common.spec | 38 ++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/libcontainers-common.changes b/libcontainers-common.changes index aaec02d..985245c 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash + +- Introduce new subpackage that ships registries.conf which uses + registry.suse.com as the only unqualified registry while pulling images on + SL Micro. (SMO-376) + ------------------------------------------------------------------- Mon Apr 8 15:15:18 UTC 2024 - Danish Prakash diff --git a/libcontainers-common.spec b/libcontainers-common.spec index c896eb0..b19fd2e 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -58,6 +58,11 @@ Requires(post): %{_bindir}/sed 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. +# (SMO-376) +Requires: registries-conf >= %{version} +Suggests: (registries-conf-sl-micro if product(SL-Micro)) Provides: libcontainers-image = %{version} Provides: libcontainers-storage = %{version} Obsoletes: libcontainers-image < %{version} @@ -94,6 +99,25 @@ Conflicts: libcontainers-openSUSE-policy %description -n libcontainers-default-policy This package ships the default /etc/containers/policy.json +%package -n registries-conf-sl-micro +Summary: Defaults to SUSE Registry on SL Micro +Provides: registries-conf = %{version}-%{release} +RemovePathPostfixes: .sl-micro +Conflicts: registries-conf-default +Requires: product(SL-Micro) + +%description -n registries-conf-sl-micro +Ships registries.conf that uses registry.suse.com as the only unqualified registry on SL Micro. + +%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-sl-micro + +%description -n registries-conf-default +Modifes registries.conf to allow SUSE and openSUSE registries to be used to pull images along with dockerhub. + %prep cp %{SOURCE9} . # Apply CNI config on streams other than ALP (bsc#1213556) @@ -139,6 +163,9 @@ cat >>%{SOURCE5} < registries.conf.sl-micro + cd common-%{commonver} %make_build docs cd .. @@ -158,7 +185,6 @@ install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json 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 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma 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.sl-micro %{buildroot}/%{_sysconfdir}/containers/registries.conf.sl-micro + %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 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %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,4 +244,10 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %files -n libcontainers-default-policy %config(noreplace) %{_sysconfdir}/containers/policy.json.default +%files -n registries-conf-sl-micro +%config(noreplace) %{_sysconfdir}/containers/registries.conf.sl-micro + +%files -n registries-conf-default +%config(noreplace) %{_sysconfdir}/containers/registries.conf.default + %changelog From 407c683a626894697830190c03b169722b14050ede27bd9cb7c058c746e5cfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 07:02:18 +0000 Subject: [PATCH 2/5] adjust descriptions OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=36 --- libcontainers-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcontainers-common.spec b/libcontainers-common.spec index b19fd2e..45a5606 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -77,7 +77,7 @@ github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo. 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 @@ -116,7 +116,7 @@ RemovePathPostfixes: .default Conflicts: registries-conf-sl-micro %description -n registries-conf-default -Modifes registries.conf to allow SUSE and openSUSE registries to be used to pull images along with dockerhub. +Ships the default registries.conf including the SUSE and openSUSE registries. %prep cp %{SOURCE9} . From 85a95f833ea6701e7e3304651c23310501bd0157b4b9d33356630f82df6d1f79 Mon Sep 17 00:00:00 2001 From: Danish Prakash Date: Tue, 30 Apr 2024 08:08:46 +0000 Subject: [PATCH 3/5] Accepting request 1170924 from home:dancermak:branches:devel:microos Revert subpackages and remove registry.o.o. & dockerhub on SLES too OBS-URL: https://build.opensuse.org/request/show/1170924 OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=37 --- libcontainers-common.changes | 5 ++--- libcontainers-common.spec | 42 +++++++----------------------------- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/libcontainers-common.changes b/libcontainers-common.changes index 985245c..8b4cb0c 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash -- Introduce new subpackage that ships registries.conf which uses - registry.suse.com as the only unqualified registry while pulling images on - SL Micro. (SMO-376) +- Remove registry.opensuse.org and docker.io from the unqualified search + registries on ALP and SLE 15 SP6+ (jsc#SMO-376, jsc#PED-8289) ------------------------------------------------------------------- Mon Apr 8 15:15:18 UTC 2024 - Danish Prakash diff --git a/libcontainers-common.spec b/libcontainers-common.spec index 45a5606..e32b7e0 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -58,11 +58,6 @@ Requires(post): %{_bindir}/sed 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. -# (SMO-376) -Requires: registries-conf >= %{version} -Suggests: (registries-conf-sl-micro if product(SL-Micro)) Provides: libcontainers-image = %{version} Provides: libcontainers-storage = %{version} Obsoletes: libcontainers-image < %{version} @@ -99,24 +94,6 @@ Conflicts: libcontainers-openSUSE-policy %description -n libcontainers-default-policy This package ships the default /etc/containers/policy.json -%package -n registries-conf-sl-micro -Summary: Defaults to SUSE Registry on SL Micro -Provides: registries-conf = %{version}-%{release} -RemovePathPostfixes: .sl-micro -Conflicts: registries-conf-default -Requires: product(SL-Micro) - -%description -n registries-conf-sl-micro -Ships registries.conf that uses registry.suse.com as the only unqualified registry on SL Micro. - -%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-sl-micro - -%description -n registries-conf-default -Ships the default registries.conf including the SUSE and openSUSE registries. %prep cp %{SOURCE9} . @@ -127,6 +104,12 @@ cp %{SOURCE9} . sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %_builddir/containers.conf %endif +cp %{SOURCE6} . +# Default to SUSE registry on SLE 15 SP6 & ALP code stream +%if 0%{?suse_version} == 1600 || 0%{?sle_version} >= 150600 +sed -i 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' $(basename %{SOURCE6}) +%endif + %setup -q -Tcq -b0 -b1 -b8 # copy the LICENSE file in the build root cp %{SOURCE2} . @@ -163,9 +146,6 @@ cat >>%{SOURCE5} < registries.conf.sl-micro - cd common-%{commonver} %make_build docs cd .. @@ -204,8 +184,7 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma 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.sl-micro %{buildroot}/%{_sysconfdir}/containers/registries.conf.sl-micro +install -D -m 0644 $(basename %{SOURCE6}) %{buildroot}/%{_sysconfdir}/containers/registries.conf %post # Comment out ostree_repo if it's blank [boo#1189893] @@ -227,6 +206,7 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %config(noreplace) %{_sysconfdir}/containers/seccomp.json %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf +%config(noreplace) %{_sysconfdir}/containers/registries.conf %{_datadir}/containers/seccomp.json %{_datadir}/containers/containers.conf @@ -244,10 +224,4 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %files -n libcontainers-default-policy %config(noreplace) %{_sysconfdir}/containers/policy.json.default -%files -n registries-conf-sl-micro -%config(noreplace) %{_sysconfdir}/containers/registries.conf.sl-micro - -%files -n registries-conf-default -%config(noreplace) %{_sysconfdir}/containers/registries.conf.default - %changelog From 48bb91a296505f4142017dd9b50ee616075fc1fdf9b9e7d79167f20fda2c0b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 3 May 2024 06:55:41 +0000 Subject: [PATCH 4/5] Accepting request 1171523 from home:danishprakash:branches:devel:microos 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) OBS-URL: https://build.opensuse.org/request/show/1171523 OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=38 --- libcontainers-common.changes | 5 +++-- libcontainers-common.spec | 42 +++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/libcontainers-common.changes b/libcontainers-common.changes index 8b4cb0c..6619623 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash -- Remove registry.opensuse.org and docker.io from the unqualified search - registries on ALP and SLE 15 SP6+ (jsc#SMO-376, jsc#PED-8289) +- 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) ------------------------------------------------------------------- Mon Apr 8 15:15:18 UTC 2024 - Danish Prakash diff --git a/libcontainers-common.spec b/libcontainers-common.spec index e32b7e0..5b91ea5 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -58,6 +58,12 @@ Requires(post): %{_bindir}/sed 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} @@ -94,6 +100,23 @@ Conflicts: libcontainers-openSUSE-policy %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 the upstream registries.conf with registry.opensuse.org and registry.suse.com as additional unqualified search registries. + +%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 +Modifes registries.conf to allow SUSE and openSUSE registries to be used to pull images along with dockerhub. %prep cp %{SOURCE9} . @@ -104,12 +127,6 @@ cp %{SOURCE9} . sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %_builddir/containers.conf %endif -cp %{SOURCE6} . -# Default to SUSE registry on SLE 15 SP6 & ALP code stream -%if 0%{?suse_version} == 1600 || 0%{?sle_version} >= 150600 -sed -i 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' $(basename %{SOURCE6}) -%endif - %setup -q -Tcq -b0 -b1 -b8 # copy the LICENSE file in the build root cp %{SOURCE2} . @@ -146,6 +163,9 @@ cat >>%{SOURCE5} < registries.conf.suse + cd common-%{commonver} %make_build docs cd .. @@ -184,7 +204,8 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma 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 $(basename %{SOURCE6}) %{buildroot}/%{_sysconfdir}/containers/registries.conf +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] @@ -206,7 +227,6 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %config(noreplace) %{_sysconfdir}/containers/seccomp.json %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf -%config(noreplace) %{_sysconfdir}/containers/registries.conf %{_datadir}/containers/seccomp.json %{_datadir}/containers/containers.conf @@ -224,4 +244,10 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora %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 + %changelog From 16bf5ff7225d7399a19d0e41cdb53f8eeacd3a985878671c744de66c346da9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 3 May 2024 06:58:33 +0000 Subject: [PATCH 5/5] fix descriptions OBS-URL: https://build.opensuse.org/package/show/devel:microos/libcontainers-common?expand=0&rev=39 --- libcontainers-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcontainers-common.spec b/libcontainers-common.spec index 5b91ea5..11ca3ee 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -107,7 +107,7 @@ RemovePathPostfixes: .suse Conflicts: registries-conf-default %description -n registries-conf-suse -Ships the upstream registries.conf with registry.opensuse.org and registry.suse.com as additional unqualified search registries. +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 @@ -116,7 +116,7 @@ RemovePathPostfixes: .default Conflicts: registries-conf-suse %description -n registries-conf-default -Modifes registries.conf to allow SUSE and openSUSE registries to be used to pull images along with dockerhub. +Ships the upstream registries.conf with registry.opensuse.org and registry.suse.com as additional unqualified search registries. %prep cp %{SOURCE9} .