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

Accepting request 408295 from home:chbrauner:branches:Virtualization:containers

Browse Source 
We've been informed (bsc#988707) that iptables will work on ppc64le with the new SLE release. Hence, we can remove the sysconfig.docker.ppc64le patch.

OBS-URL: https://build.opensuse.org/request/show/408295
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=118
This commit is contained in:
Jordi Massaguer 2016-07-14 09:13:29 +00:00 committed by Git OBS Bridge
parent da0ea66941
commit 6355b5c0d1
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 13 13:41:33 UTC 2016 - cbrauner@suse.de
- remove sysconfig.docker.ppc64le patch
setting iptables option on ppc64le works now (bsc#988707)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 5 17:52:58 UTC 2016 - jmassaguerpla@suse.com Tue Jul 5 17:52:58 UTC 2016 - jmassaguerpla@suse.com

6
docker.spec
View File

@ -38,8 +38,6 @@ Source4: sysconfig.docker
Source6: docker-rpmlintrc Source6: docker-rpmlintrc
Source7: README_SUSE.md Source7: README_SUSE.md
Source8: docker-audit.rules Source8: docker-audit.rules
# TODO: remove once we figure out what is wrong with iptables on ppc64le
Source100: sysconfig.docker.ppc64le
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ # Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
Patch101: gcc-go-patches.patch Patch101: gcc-go-patches.patch
Patch102: netlink_gcc_go.patch Patch102: netlink_gcc_go.patch
@ -226,11 +224,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules
install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules
# sysconfig file # sysconfig file
%ifarch ppc64le
install -D -m 644 %{SOURCE100} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker
%else
install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker
%endif
%ifarch %{go_arches} %ifarch %{go_arches}
# install manpages # install manpages

10
sysconfig.docker.ppc64le
View File

@ -1,10 +0,0 @@
## Path : System/Management
## Description : Extra cli switches for docker daemon
## Type : string
## Default : ""
## ServiceRestart : docker
#
# TODO: remove it once we fix the real issue
DOCKER_OPTS=" -iptables=false "