rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 632983 from home:RBrownSUSE:branches:Virtualization:containers

Browse Source 
attempt #2

OBS-URL: https://build.opensuse.org/request/show/632983
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=265
This commit is contained in:
Valentin Rothberg 2018-09-04 08:34:39 +00:00 committed by Git OBS Bridge
parent bf689df1d5
commit 1754fa7fc7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 4 08:32:43 UTC 2018 - rbrown@suse.com
- ExcludeArch i586 for entire docker-kubic flavour
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 4 07:32:47 UTC 2018 - rbrown@suse.com Tue Sep 4 07:32:47 UTC 2018 - rbrown@suse.com

3
docker.spec
View File

@ -152,6 +152,8 @@ Conflicts: %{realname}
Provides: %{realname} = %{version} Provides: %{realname} = %{version}
# Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package # Kubernetes requires cri-runtime, which should be provided only by the -kubic flavour of this package
Provides: cri-runtime Provides: cri-runtime
# No i586 Kubernetes, so docker-kubic must not be built for i586 also
ExcludeArch: i586
%endif %endif
%description %description
@ -238,7 +240,6 @@ Test package for docker. It contains the source code and the tests.
%package kubeadm-criconfig %package kubeadm-criconfig
Summary: docker container runtime configuration for kubeadm Summary: docker container runtime configuration for kubeadm
Group: System/Management Group: System/Management
ExcludeArch: i586
Requires: kubernetes-kubeadm Requires: kubernetes-kubeadm
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Supplements: docker-kubic Supplements: docker-kubic