diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2020-01-03 09:21:43 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-08 16:19:53 -0500 |
| commit | 456fbc6dffb658daf3f0d1eaf0f0a05aef1c5137 (patch) | |
| tree | 36ae75f2dc7355d796c3569d46a45cc0cd7cdf4f /recipes-containers | |
| parent | 30e3de60e7f803e332f78ee8c41179cf0336c27c (diff) | |
| download | meta-virtualization-456fbc6dffb658daf3f0d1eaf0f0a05aef1c5137.tar.gz | |
docker: remove docker.service.rpm
This file is useless and misleading. Remove it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/docker/docker-ce_git.bb | 1 | ||||
| -rw-r--r-- | recipes-containers/docker/docker-moby.bb | 1 |
2 files changed, 2 insertions, 0 deletions
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() { | |||
| 107 | install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system | 107 | install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system |
| 108 | # replaces one copied from above with one that uses the local registry for a mirror | 108 | # replaces one copied from above with one that uses the local registry for a mirror |
| 109 | install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system | 109 | install -m 644 ${S}/src/import/components/engine/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system |
| 110 | rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm | ||
| 110 | else | 111 | else |
| 111 | install -d ${D}${sysconfdir}/init.d | 112 | install -d ${D}${sysconfdir}/init.d |
| 112 | install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init | 113 | 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() { | |||
| 126 | install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system | 126 | install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system |
| 127 | # replaces one copied from above with one that uses the local registry for a mirror | 127 | # replaces one copied from above with one that uses the local registry for a mirror |
| 128 | install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system | 128 | install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system |
| 129 | rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm | ||
| 129 | else | 130 | else |
| 130 | install -d ${D}${sysconfdir}/init.d | 131 | install -d ${D}${sysconfdir}/init.d |
| 131 | install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init | 132 | install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init |