SLFO-pool/libcontainers-common
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main libcontainers-common revision 54f0b39a37368aa325cee22162aeec6c

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-16 15:37:13 +02:00
parent 18d5d3e51f
commit 92e99aa731
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainers-common.changes
View File

@ -1,9 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prakash@suse.com> Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prakash@suse.com>
- Introduce new subpackage that ships registries.conf which uses - Introduce new subpackage that ships registries.conf that uses
registry.suse.com as the only unqualified registry while pulling images on registry.suse.com as the only unqualified registry while pulling images on
SL Micro. (SMO-376) SL Micro and SP6. (jsc#SMO-376, jsc#PED-8289)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 8 15:15:18 UTC 2024 - Danish Prakash <danish.prakash@suse.com> Mon Apr 8 15:15:18 UTC 2024 - Danish Prakash <danish.prakash@suse.com>

26
libcontainers-common.spec
View File

@ -60,9 +60,10 @@ Requires: libcontainers-policy >= %{version}
Suggests: (libcontainers-policy-openSUSE if openSUSE-release) Suggests: (libcontainers-policy-openSUSE if openSUSE-release)
# Default to SUSE registry on SL Micro, # Default to SUSE registry on SL Micro,
# keep SUSE, openSUSE and dockerhub registries otherwise. # keep SUSE, openSUSE and dockerhub registries otherwise.
# (SMO-376) # (jsc#SMO-376, jsc#PED-8289)
Requires: registries-conf >= %{version} Requires: registries-conf >= %{version}
Suggests: (registries-conf-sl-micro if product(SL-Micro)) 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-image = %{version}
Provides: libcontainers-storage = %{version} Provides: libcontainers-storage = %{version}
Obsoletes: libcontainers-image < %{version} Obsoletes: libcontainers-image < %{version}
@ -99,24 +100,23 @@ Conflicts: libcontainers-openSUSE-policy
%description -n libcontainers-default-policy %description -n libcontainers-default-policy
This package ships the default /etc/containers/policy.json This package ships the default /etc/containers/policy.json
%package -n registries-conf-sl-micro %package -n registries-conf-suse
Summary: Defaults to SUSE Registry on SL Micro Summary: Defaults to SUSE Registry on SL Micro
Provides: registries-conf = %{version}-%{release} Provides: registries-conf = %{version}-%{release}
RemovePathPostfixes: .sl-micro RemovePathPostfixes: .suse
Conflicts: registries-conf-default Conflicts: registries-conf-default
Requires: product(SL-Micro)
%description -n registries-conf-sl-micro %description -n registries-conf-suse
Ships registries.conf that uses registry.suse.com as the only unqualified registry on SL Micro. Ships a modified registries.conf with registry.suse.com as the only unqualified search registry.
%package -n registries-conf-default %package -n registries-conf-default
Summary: Add SUSE and openSUSE registries to be used to pull images along with dockerhub Summary: Add SUSE and openSUSE registries to be used to pull images along with dockerhub
Provides: registries-conf = %{version}-%{release} Provides: registries-conf = %{version}-%{release}
RemovePathPostfixes: .default RemovePathPostfixes: .default
Conflicts: registries-conf-sl-micro Conflicts: registries-conf-suse
%description -n registries-conf-default %description -n registries-conf-default
Ships the default registries.conf including the SUSE and openSUSE registries. Ships the upstream registries.conf with registry.opensuse.org and registry.suse.com as additional unqualified search registries.
%prep %prep
cp %{SOURCE9} . cp %{SOURCE9} .
@ -164,7 +164,7 @@ cat >>%{SOURCE5} <<EOL
EOL EOL
# Default to SUSE registry on SL Micro # Default to SUSE registry on SL Micro
sed 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' %{SOURCE6} > registries.conf.sl-micro sed 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' %{SOURCE6} > registries.conf.suse
cd common-%{commonver} cd common-%{commonver}
%make_build docs %make_build docs
@ -205,7 +205,7 @@ install -D -m 0644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/containers/policy.jso
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.default 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 %{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 registries.conf.suse %{buildroot}/%{_sysconfdir}/containers/registries.conf.suse
%post %post
# Comment out ostree_repo if it's blank [boo#1189893] # Comment out ostree_repo if it's blank [boo#1189893]
@ -244,8 +244,8 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
%files -n libcontainers-default-policy %files -n libcontainers-default-policy
%config(noreplace) %{_sysconfdir}/containers/policy.json.default %config(noreplace) %{_sysconfdir}/containers/policy.json.default
%files -n registries-conf-sl-micro %files -n registries-conf-suse
%config(noreplace) %{_sysconfdir}/containers/registries.conf.sl-micro %config(noreplace) %{_sysconfdir}/containers/registries.conf.suse
%files -n registries-conf-default %files -n registries-conf-default
%config(noreplace) %{_sysconfdir}/containers/registries.conf.default %config(noreplace) %{_sysconfdir}/containers/registries.conf.default