Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09

components/packaging/rpm/fedora-27/docker-ce.spec

@@ -81,8 +81,6 @@ for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
 done
 VERSION=%{_origversion} hack/make.sh dynbinary
 popd
-mkdir -p plugin
-printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "${DISTRO}" "%{_version}" > plugin/.plugin-metadata
 
 %check
 cli/build/docker -v

components/packaging/rpm/fedora-28/docker-ce.spec

@@ -81,8 +81,6 @@ for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
 done
 VERSION=%{_origversion} hack/make.sh dynbinary
 popd
-mkdir -p plugin
-printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "${DISTRO}" "%{_version}" > plugin/.plugin-metadata
 
 %check
 cli/build/docker -v

components/packaging/systemd/docker.service

@@ -4,6 +4,7 @@ Documentation=https://docs.docker.com
 BindsTo=containerd.service
 After=network-online.target firewalld.service
 Wants=network-online.target
+Requires=docker.socket
 
 [Service]
 Type=notify