From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v2 08/12] docker: expand debian-amd64 image to include tag tools
Date: Thu, 14 Jan 2021 17:55:47 +0000 [thread overview]
Message-ID: <20210114175547.GX1643043@redhat.com> (raw)
In-Reply-To: <9f187737-f2d6-21d6-787e-b4a5ff655c42@redhat.com>
On Thu, Jan 14, 2021 at 06:53:36PM +0100, Philippe Mathieu-Daudé wrote:
> On 1/14/21 6:52 PM, Daniel P. Berrangé wrote:
> > On Thu, Jan 14, 2021 at 06:50:36PM +0100, Philippe Mathieu-Daudé wrote:
> >> Hi Alex,
> >>
> >> On 1/14/21 5:57 PM, Alex Bennée wrote:
> >>> This is going to be helpful when we want to both test the tool
> >>> integration and in the case of global generate a xref doc build.
> >>>
> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> >>> ---
> >>> tests/docker/dockerfiles/debian-amd64.docker | 5 ++++-
> >>> 1 file changed, 4 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
> >>> index 55075d9fce..a98314757d 100644
> >>> --- a/tests/docker/dockerfiles/debian-amd64.docker
> >>> +++ b/tests/docker/dockerfiles/debian-amd64.docker
> >>> @@ -1,7 +1,7 @@
> >>> #
> >>> # Docker x86_64 target
> >>> #
> >>> -# This docker target builds on the debian Stretch base image. Further
> >>> +# This docker target builds on the Debian Buster base image. Further
> >>> # libraries which are not widely available are installed by hand.
> >>> #
> >>> FROM qemu/debian10
> >>> @@ -14,7 +14,10 @@ RUN apt update && \
> >>> RUN apt update && \
> >>> DEBIAN_FRONTEND=noninteractive eatmydata \
> >>> apt install -y --no-install-recommends \
> >>> + cscope \
> >>> genisoimage \
> >>> + exuberant-ctags \
> >>> + global \
> >>
> >> This clash with Daniel's series which seems ready (and harder
> >> to rebase):
> >>
> >> 'start using libvirt-ci's "lcitool" for dockerfiles'
> >> https://www.mail-archive.com/qemu-devel@nongnu.org/msg772839.html
> >>
> >> Do you mind getting it merged before your patch?
> >
> > I don't mind either way. I'll have to get mappings for those three
> > packages added to libvirt-ci, so that we pull them in on the other
> > non-debian distros too. Aside from that it is no big deal.
>
> Thanks for the quick feedback :)
Actually my answer was a tangent. My series doesn't touch the
debian dockerfile(s) at all, only ubuntu, fedora, centos & suse.
I've left debian untouched because QEMU's handling that with layering
so it needs further consideration wrt libvirt-ci auto-generation.
IOW, there is no clash between these series
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2021-01-14 18:46 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 16:57 [PATCH v2 00/12] testing/next (tags!, shippable/travis deprecation, regression fixes, checkpatch) Alex Bennée
2021-01-14 16:57 ` [PATCH v2 01/12] tests/docker: Remove Debian 9 remnant lines Alex Bennée
2021-01-14 20:03 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 02/12] Makefile: add GNU global tags support Alex Bennée
2021-01-14 18:09 ` Philippe Mathieu-Daudé
2021-01-14 16:57 ` [PATCH v2 03/12] shippable.yml: Remove jobs duplicated on Gitlab-CI Alex Bennée
2021-01-14 16:57 ` [PATCH v2 04/12] Add newline when generating Dockerfile Alex Bennée
2021-01-14 17:51 ` Philippe Mathieu-Daudé
2021-01-14 19:42 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 05/12] Makefile: wrap ctags in quiet-command calls Alex Bennée
2021-01-14 18:07 ` Philippe Mathieu-Daudé
2021-01-14 19:46 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 06/12] Makefile: wrap etags " Alex Bennée
2021-01-14 18:08 ` Philippe Mathieu-Daudé
2021-01-14 19:48 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 07/12] Makefile: wrap cscope " Alex Bennée
2021-01-14 18:08 ` Philippe Mathieu-Daudé
2021-01-14 19:45 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 08/12] docker: expand debian-amd64 image to include tag tools Alex Bennée
2021-01-14 17:50 ` Philippe Mathieu-Daudé
2021-01-14 17:52 ` Daniel P. Berrangé
2021-01-14 17:53 ` Philippe Mathieu-Daudé
2021-01-14 17:55 ` Daniel P. Berrangé [this message]
2021-01-14 19:41 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 09/12] gitlab: move docs and tools build across from Travis Alex Bennée
2021-01-14 19:54 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 10/12] Fix build with new yank feature by adding stubs Alex Bennée
2021-01-14 17:47 ` Philippe Mathieu-Daudé
2021-01-14 18:50 ` Alex Bennée
2021-01-14 16:57 ` [PATCH v2 11/12] gitlab: migrate the minimal tools and unit tests from Travis Alex Bennée
2021-01-14 17:57 ` Philippe Mathieu-Daudé
2021-01-14 19:00 ` Thomas Huth
2021-01-14 19:36 ` Willian Rampazzo
2021-01-14 16:57 ` [PATCH v2 12/12] scripts/checkpatch.pl: fix git-show invocation to include diffstat Alex Bennée
2021-01-14 18:05 ` Philippe Mathieu-Daudé
2021-01-14 19:51 ` Willian Rampazzo
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=20210114175547.GX1643043@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).