From: "Bruce Ashfield" <bruce.ashfield@gmail.com>
To: Chen Qi <Qi.Chen@windriver.com>
Cc: meta-virtualization@yoctoproject.org
Subject: Re: [meta-virtualization][PATCH] docker: remove docker.service.rpm
Date: Wed, 8 Jan 2020 16:20:14 -0500 [thread overview]
Message-ID: <20200108212011.GA12328@gmail.com> (raw)
In-Reply-To: <20200103012143.33707-1-Qi.Chen@windriver.com>
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
>
>
prev parent reply other threads:[~2020-01-08 21:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 1:21 [meta-virtualization][PATCH] docker: remove docker.service.rpm Chen Qi
2020-01-08 21:20 ` Bruce Ashfield [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200108212011.GA12328@gmail.com \
--to=bruce.ashfield@gmail.com \
--cc=Qi.Chen@windriver.com \
--cc=meta-virtualization@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.