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
This commit is contained in:
parent
407c683a62
commit
85a95f833e
@ -1,9 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prakash@suse.com>
|
||||
|
||||
- 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 <danish.prakash@suse.com>
|
||||
|
@ -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} <<EOL
|
||||
%{_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.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
|
||||
|
Loading…
Reference in New Issue
Block a user