Bug 1462113 - enable docker support for s390x
Summary: enable docker support for s390x
Keywords:
Status: CLOSED CURRENTRELEASE
Alias: None
Product: Fedora
Classification: Fedora
Component: cockpit
Version: rawhide
Hardware: s390x
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Dominik Perpeet
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks: ZedoraTracker
TreeView+ depends on / blocked
 
Reported: 2017-06-16 08:33 UTC by Dan Horák
Modified: 2017-06-23 09:28 UTC (History)
5 users (show)

Fixed In Version: cockpit-docker-143-1.fc27.s390x.rpm
Doc Type: If docs needed, set a value
Doc Text:
Clone Of:
Environment:
Last Closed: 2017-06-23 09:28:00 UTC


Attachments (Terms of Use)

Description Dan Horák 2017-06-16 08:33:48 UTC
There is a working docker on the s390x platform in all Fedora releases, so please enable the docker support in cockpit with eg.

diff --git a/cockpit.spec b/cockpit.spec
index ba9ea84..9fdf495 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -87,7 +87,7 @@ Recommends: %{name}-dashboard = %{version}-%{release}
 Recommends: %{name}-networkmanager = %{version}-%{release}
 Recommends: %{name}-storaged = %{version}-%{release}
 Recommends: sscg >= 2.0.4
-%ifarch x86_64 %{arm} aarch64 ppc64le i686
+%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 Recommends: %{name}-docker = %{version}-%{release}
 %endif
 Suggests: %{name}-pcp = %{version}-%{release}
@@ -212,7 +212,7 @@ echo '%dir %{_datadir}/%{name}/selinux' > selinux.list
 find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list
 %endif
 
-%ifarch x86_64 %{arm} aarch64 ppc64le i686
+%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 echo '%dir %{_datadir}/%{name}/docker' > docker.list
 find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
 %else
@@ -594,7 +594,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 
 %endif
 
-%ifarch x86_64 %{arm} aarch64 ppc64le i686
+%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 
 %package docker
 Summary: Cockpit user interface for Docker containers


Version-Release number of selected component (if applicable):
cockpit-142-1.fc27

Comment 1 Dan Horák 2017-06-16 10:05:23 UTC
upstream PR is https://github.com/cockpit-project/cockpit/pull/6954

Comment 2 Dominik Perpeet 2017-06-23 08:48:54 UTC
Hi,

the patch was merged and included in the release of Cockpit 143 [0]. It doesn't look like s390x gets built on Fedora 26 by default, but cockpit-docker-141  was built for s390x on Fedora 27 [1].

rpm: cockpit-docker-143-1.fc27.s390x.rpm [2]

Does this meet your expectations?

[0] https://github.com/cockpit-project/cockpit/releases/tag/143
[1] https://koji.fedoraproject.org/koji/buildinfo?buildID=909630
[2] https://koji.fedoraproject.org/koji/rpminfo?rpmID=9995084

Comment 3 Dan Horák 2017-06-23 08:58:22 UTC
Hi,

yes, it's correct, s390x was merged into the primary koji instance at the end of April (for F-27+). F<=26 is still built in https://s390.koji.fedoraproject.org and cockpit 143 is built there [3].

[3] https://s390.koji.fedoraproject.org/koji/buildinfo?buildID=493072

Comment 4 Dominik Perpeet 2017-06-23 09:28:00 UTC
Thanks for confirming!


Note You need to log in before you can comment on or make changes to this bug.