Accepting request 447279 from home:cyphar:containers

Remove socket activation from Docker, to match upstream.

OBS-URL: https://build.opensuse.org/request/show/447279
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=159

docker.spec

@@ -37,7 +37,6 @@
 %define docker_graph              %{docker_store}/graph
 %define git_version 8eab29e
 %define version_unconverted 1.12.5
-%define docker_version 1.12.1
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
 # When upgrading to a new version requires the service not to be restarted
 # Due to a long migration process update last_migration_version to the new version
@@ -105,11 +104,6 @@ Recommends:     docker-image-migrator
 Conflicts:      lxc < 1.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    %ix86 s390 ppc
-%if 0%{?suse_version} > 1320
-Source5:        docker.socket
-%else
-Source5:        docker_systemd_lt_214.socket
-%endif
 %ifarch %{go_arches}
 BuildRequires:  go >= 1.5
 BuildRequires:  go-go-md2man
@@ -321,7 +315,6 @@ cp -av tests.main tests.sh %{buildroot}%{_prefix}/src/docker/hack/
 # systemd service
 #
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.socket
 ln -sf service %{buildroot}%{_sbindir}/rcdocker
 
 #
@@ -372,7 +365,7 @@ if [[ -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2
 fi
 
 getent group docker >/dev/null || groupadd -r docker
-%service_add_pre %{name}.service %{name}.socket
+%service_add_pre %{name}.service
 
 %post
 if [  -e %{docker_migration_testfile} ]; then
@@ -382,18 +375,18 @@ else
         rm %{docker_migration_warnfile}
     fi
 fi
-%service_add_post %{name}.service %{name}.socket
+%service_add_post %{name}.service
 %{fillup_only -n docker}
 
 %preun
-%service_del_preun %{name}.service %{name}.socket
+%service_del_preun %{name}.service
 
 %postun
 if [  -e %{docker_migration_testfile} ]; then
     rm %{docker_migration_testfile}
     export DISABLE_RESTART_ON_UPDATE=yes
 fi
-%service_del_postun %{name}.service %{name}.socket
+%service_del_postun %{name}.service
 
 %files
 %defattr(-,root,root)
@@ -404,7 +397,6 @@ fi
 %{_sbindir}/rcdocker
 %{_libexecdir}/docker/
 %{_unitdir}/%{name}.service
-%{_unitdir}/%{name}.socket
 %config %{_sysconfdir}/audit/rules.d/%{name}.rules
 %{_udevrulesdir}/80-%{name}.rules
 %{_localstatedir}/adm/fillup-templates/sysconfig.docker