From: Martin Jansa <martin.jansa@gmail.com>
To: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: fib@cisco.com,
"meta-virtualization@lists.yoctoproject.org"
<meta-virtualization@lists.yoctoproject.org>
Subject: Re: [meta-virtualization] [kirkstone][RFC][PATCHv2] docker: update to v20.10.25 + 58 commits to fix compatibility with go currently in kirkstone
Date: Wed, 16 Aug 2023 07:54:47 +0200 [thread overview]
Message-ID: <CA+chaQc22iEWXWLR8Zjpi1tSS8ijuW7rmRQbRt+KLVrsECKYqw@mail.gmail.com> (raw)
In-Reply-To: <CADkTA4P9Ge+uzpdgAjmy2r0obAwE-hCq8F5_OBObAoVWCQHkew@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5211 bytes --]
The issue is that in last version I've somehow missed the
SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49"
update in docker-ce.
Will send the fix shortly.
On Wed, Aug 16, 2023 at 6:04 AM Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
> On Tue, Aug 15, 2023 at 5:14 PM Martin Jansa <Martin.Jansa@gmail.com>
> wrote:
> >
> > Hmm, I was testing docker-moby, not docker-ce, but I don't see why it
> would be happening. Will try docker-ce tomorrow.
> >
>
> docker-ce carries some patches for integration with downstream layers
> that have some patches for extended functionality required for
> container OS namespace manipulations.
>
> I merged the patch without testing it against -ce myself, so I
> wouldn't worry about spending too much time on it, I can do the
> refreshes.
>
> Bruce
>
> > On Tue, Aug 15, 2023 at 11:06 PM Ruslan Babayev (fib) via
> lists.yoctoproject.org <fib=cisco.com@lists.yoctoproject.org> wrote:
> >>
> >> Hi Martin,
> >>
> >>
> >>
> >> Build fails with:
> >>
> >>
> >>
> >> ERROR:
> docker-ce-20.10.25-ce+git3056208812eb5e792fa99736c9167d1e10f4ab49-r0
> do_patch: Applying patch
> '0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch' on target directory
> '<REDACTED>/tmp/work/core2-64-poky-linux/docker-ce/20.10.25-ce+git3056208812eb5e792fa99736c9167d1e10f4ab49-r0/git/src/import'
> >>
> >> CmdError('quilt --quiltrc
> <REDACTED>/tmp/work/core2-64-poky-linux/docker-ce/20.10.25-ce+git3056208812eb5e792fa99736c9167d1e10f4ab49-r0/recipe-sysroot-native/etc/quiltrc
> push', 0, 'stdout: Applying patch
> 0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch
> >>
> >> patching file Dockerfile
> >>
> >> Hunk #1 FAILED at 3.
> >>
> >> Hunk #2 FAILED at 267.
> >>
> >> Hunk #3 FAILED at 316.
> >>
> >> 3 out of 3 hunks FAILED -- rejects in file Dockerfile
> >>
> >> patching file Dockerfile.e2e
> >>
> >> Hunk #1 FAILED at 1.
> >>
> >> 1 out of 1 hunk FAILED -- rejects in file Dockerfile.e2e
> >>
> >> patching file Dockerfile.simple
> >>
> >> Hunk #1 FAILED at 5.
> >>
> >> 1 out of 1 hunk FAILED -- rejects in file Dockerfile.simple
> >>
> >> patching file Dockerfile.windows
> >>
> >> Hunk #1 FAILED at 165.
> >>
> >> 1 out of 1 hunk FAILED -- rejects in file Dockerfile.windows
> >>
> >> patching file hack/dockerfile/install/gotestsum.installer
> >>
> >> Hunk #1 FAILED at 1.
> >>
> >> 1 out of 1 hunk FAILED -- rejects in file
> hack/dockerfile/install/gotestsum.installer
> >>
> >> Patch 0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch can be
> reverse-applied
> >>
> >>
> >>
> >> stderr: ')
> >>
> >> ERROR: Logfile of failure stored in:
> <REDACTED>/tmp/work/core2-64-poky-linux/docker-ce/20.10.25-ce+git3056208812eb5e792fa99736c9167d1e10f4ab49-r0/temp/log.do_patch.622820
> >>
> >> ERROR: Task
> <REDACTED>/meta-virtualization/recipes-containers/docker/docker-ce_git.bb:do_patch)
> failed with exit code '1'
> >>
> >>
> >>
> >>
> >>
> >> From: meta-virtualization@lists.yoctoproject.org <
> meta-virtualization@lists.yoctoproject.org> On Behalf Of Martin Jansa
> >> Sent: Monday, August 14, 2023 12:03 PM
> >> To: Martin.Jansa@gmail.com
> >> Cc: meta-virtualization@lists.yoctoproject.org
> >> Subject: Re: [meta-virtualization] [kirkstone][RFC][PATCHv2] docker:
> update to v20.10.25 + 58 commits to fix compatibility with go currently in
> kirkstone
> >>
> >>
> >>
> >> On Mon, Aug 14, 2023 at 9:00 PM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >>
> >>
> >>
> >>
> >>
> >> On Mon, Aug 14, 2023 at 5:17 PM Martin Jansa via lists.yoctoproject.org
> <Martin.Jansa=gmail.com@lists.yoctoproject.org> wrote:
> >>
> >> RFC, because I've only build tested this in kirkstone, waiting for
> whole image to build to test it in runtime
> >>
> >>
> >>
> >> Passed minimal sanity check on rpi4-64:
> >>
> >>
> >>
> >> my fat fingers didn't pass copy&pasting test, here 2nd try:
> >>
> >>
> >>
> >> root@rpi4:~# systemctl start docker.service
> >> root@rpi4:~# docker run -it --rm ubuntu
> >> Unable to find image 'ubuntu:latest' locally
> >> latest: Pulling from library/ubuntu
> >> 5af00eab9784: Pull complete
> >> Digest:
> sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508
> >> Status: Downloaded newer image for ubuntu:latest
> >> root@92414c21da3d:/#
> >>
> >> root@92414c21da3d:/# cat /etc/lsb-release
> >> DISTRIB_ID=Ubuntu
> >> DISTRIB_RELEASE=22.04
> >> DISTRIB_CODENAME=jammy
> >> DISTRIB_DESCRIPTION="Ubuntu 22.04.2 LTS"
> >>
> >>
> >>
> >>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#8193):
> https://lists.yoctoproject.org/g/meta-virtualization/message/8193
> > Mute This Topic: https://lists.yoctoproject.org/mt/100738603/1050810
> > Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
> [bruce.ashfield@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 7760 bytes --]
prev parent reply other threads:[~2023-08-16 5:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 15:13 [kirkstone][RFC][PATCHv2] docker: update to v20.10.25 + 58 commits to fix compatibility with go currently in kirkstone Martin Jansa
2023-08-14 15:17 ` Martin Jansa
[not found] ` <177B48E707B1FD85.12117@lists.yoctoproject.org>
2023-08-14 19:00 ` [meta-virtualization] " Martin Jansa
2023-08-14 19:02 ` Martin Jansa
2023-08-15 21:06 ` Abdurrahman Hussain (fib)
2023-08-15 21:14 ` Martin Jansa
2023-08-16 4:04 ` Bruce Ashfield
2023-08-16 5:54 ` Martin Jansa [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=CA+chaQc22iEWXWLR8Zjpi1tSS8ijuW7rmRQbRt+KLVrsECKYqw@mail.gmail.com \
--to=martin.jansa@gmail.com \
--cc=bruce.ashfield@gmail.com \
--cc=fib@cisco.com \
--cc=meta-virtualization@lists.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 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 read-only IMAP folder(s) and NNTP newsgroup(s).