pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Remove conditional Patch directive for SUSE secrets, since conditionally

Browse Source 
including patches results in incompatible .src.rpms. The patch is still
  applied conditionally.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=103
This commit is contained in:
Aleksa Sarai 2016-05-02 07:41:45 +00:00 committed by Git OBS Bridge
parent 172c1f6bc3
commit f2ab5e5b2d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 2 07:40:22 UTC 2016 - asarai@suse.de
* Remove conditional Patch directive for SUSE secrets, since conditionally
including patches results in incompatible .src.rpms. The patch is still
applied conditionally.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 29 09:04:54 UTC 2016 - asarai@suse.de Fri Apr 29 09:04:54 UTC 2016 - asarai@suse.de

4
docker.spec
View File

@ -47,13 +47,9 @@ 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 # TODO: remove once we figure out what is wrong with iptables on ppc64le
Source100: sysconfig.docker.ppc64le Source100: sysconfig.docker.ppc64le
%if 0%{?is_opensuse}
# nothing
%else
# The mount-secrets patch is be a SLE-specific feature. As such, it is disabled by default on openSUSE. # The mount-secrets patch is be a SLE-specific feature. As such, it is disabled by default on openSUSE.
# PATCH-FEATURE-SLE docker-mount-secrets.patch -- pass the SCC machine credentials and the /etc/SUSEConnect file to containers # PATCH-FEATURE-SLE docker-mount-secrets.patch -- pass the SCC machine credentials and the /etc/SUSEConnect file to containers
Patch200: docker-mount-secrets.patch Patch200: docker-mount-secrets.patch
%endif
# 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