diff --git a/docker.spec b/docker.spec index ea4636c..d218938 100644 --- a/docker.spec +++ b/docker.spec @@ -48,6 +48,13 @@ Source100: sysconfig.docker.ppc64le Patch1: gcc5_socket_workaround.patch Patch2: fix-docker-init.patch Patch3: fix-apparmor.patch +%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. +# PATCH-FEATURE-SLE docker-mount-secrets.patch -- pass the SCC machine credentials and the /etc/SUSEConnect file to containers +Patch200: docker-mount-secrets.patch +%endif # TODO: Remove this once we update to Docker 1.11.0. This has been merged in # https://github.com/docker/docker/pull/21723 Patch4: fix-btrfs-ioctl-structure.patch @@ -155,19 +162,24 @@ Test package for docker. It contains the source code and the tests. %prep %setup -q -n %{name}-%{version} -# 1330 is Tumbleweed after leap has been released -# gcc5-go in Tumbleweed includes this commit +# >= 1315 means leap, sle12, or Tumbleweed +# gcc5-go in those distros includes this commit # https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b09626f5545eb # Which "fixes" the data type for RawSockaddr.Data # However, docker now expects the "wrong" data type, since docker had a workaround # for that issue. -# Thus, we need to workaround the workaroundn in tumbleweed -%if 0%{?suse_version} >= 1330 && 0%{?is_opensuse} == 1 +# Thus, we need to workaround the workaround +%if 0%{?suse_version} >= 1315 %patch1 -p1 %endif %patch2 -p1 %patch3 -p1 %patch4 -p1 +%if 0%{?is_opensuse} +# nothing +%else +%patch200 -p1 +%endif %ifnarch %go_arches %patch101 -p1 %patch102 -p1