From 456fbc6dffb658daf3f0d1eaf0f0a05aef1c5137 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 3 Jan 2020 09:21:43 +0800 Subject: docker: remove docker.service.rpm This file is useless and misleading. Remove it. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker-ce_git.bb | 1 + recipes-containers/docker/docker-moby.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index 817795f0..8b8136d5 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb @@ -107,6 +107,7 @@ do_install() { install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system # replaces one copied from above with one that uses the local registry for a mirror install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system + rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm else install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb index 0936fdfb..0e1f4e2c 100644 --- a/recipes-containers/docker/docker-moby.bb +++ b/recipes-containers/docker/docker-moby.bb @@ -126,6 +126,7 @@ do_install() { install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system # replaces one copied from above with one that uses the local registry for a mirror install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system + rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm else install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init -- cgit v1.2.3-54-g00ecf