From b8014b87d17353fb02745c9ac212c4c3d4a7e130 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Nov 2018 13:24:01 +0100 Subject: [PATCH 1/2] Remove remnants from telemetry plugin from Fedora 27, 28 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit d91edcf9ae07433110c62ddfbcdb7566fb285a81) Signed-off-by: Sebastiaan van Stijn Upstream-commit: f7b95cb416685d86541f62440927a6613af3cb25 Component: packaging --- components/packaging/rpm/fedora-27/docker-ce.spec | 2 -- components/packaging/rpm/fedora-28/docker-ce.spec | 2 -- 2 files changed, 4 deletions(-) diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index d646a1e327..cd8bcfe5b6 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/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 diff --git a/components/packaging/rpm/fedora-28/docker-ce.spec b/components/packaging/rpm/fedora-28/docker-ce.spec index d646a1e327..cd8bcfe5b6 100644 --- a/components/packaging/rpm/fedora-28/docker-ce.spec +++ b/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 From 9b0d684d7fa67859524492a4b990c8a03c9251b1 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 3 Dec 2018 19:14:10 +0000 Subject: [PATCH 2/2] Add docker.socket requirement for docker.service Without this the docker.socket would not start by default when starting the docker.service leading to failures to start. Signed-off-by: Eli Uriegas (cherry picked from commit 88885d18b1bb0ef91eab4ad3311773f9c40838b7) Signed-off-by: Andrew Hsu Upstream-commit: 93f125a2602b7eb72128cbc16d9d35c9d92ed18a Component: packaging --- components/packaging/systemd/docker.service | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index eb841d1356..9cc6216dab 100644 --- a/components/packaging/systemd/docker.service +++ b/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