* [meta-virtualization][PATCH] docker: remove docker.service.rpm
@ 2020-01-03 1:21 Chen Qi
2020-01-08 21:20 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Chen Qi @ 2020-01-03 1:21 UTC (permalink / raw)
To: meta-virtualization
This file is useless and misleading. Remove it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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 817795f..8b8136d 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 0936fdf..0e1f4e2 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
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [meta-virtualization][PATCH] docker: remove docker.service.rpm
2020-01-03 1:21 [meta-virtualization][PATCH] docker: remove docker.service.rpm Chen Qi
@ 2020-01-08 21:20 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2020-01-08 21:20 UTC (permalink / raw)
To: Chen Qi; +Cc: meta-virtualization
merged
Bruce
In message: [meta-virtualization][PATCH] docker: remove docker.service.rpm
on 03/01/2020 Chen Qi wrote:
> This file is useless and misleading. Remove it.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> 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 817795f..8b8136d 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 0936fdf..0e1f4e2 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
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-08 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-03 1:21 [meta-virtualization][PATCH] docker: remove docker.service.rpm Chen Qi
2020-01-08 21:20 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.