vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1 #41745

AkihiroSuda · 2020-12-03T10:37:36Z

Follow-up to #41688.

~~Also updates containerd: #41688 (comment)~~
EDIT: by @tiborvass, see #41745 (comment)

thaJeztah · 2020-12-03T11:15:06Z

vendor.conf

I don't see a change in go.mod for buildkit, which is still at 0edc412565dc - perhaps do this separate?

AkihiroSuda · 2020-12-03T12:07:50Z

CI seems hitting a regression?

=== RUN   TestDockerSuite/TestBuildEmptyEntrypoint
    --- FAIL: TestDockerSuite/TestBuildEmptyEntrypoint (0.19s)
        docker_cli_build_test.go:1709: assertion failed: 
            Command:  /usr/local/cli/docker build -t testbuildentrypoint -
            ExitCode: 1
            Error:    exit status 1
            Stdout:   Sending build context to Docker daemon  2.048kB

            
            Stderr:   Error response from daemon: dockerfile parse error line 2: ENTRYPOINT requires at least one argument
            
            
            Failures:
            ExitCode was 1 expected 0
            Expected no error

thaJeztah · 2020-12-03T12:23:09Z

Looks like that test was originally added in #7806 (78a847a)

thaJeztah · 2020-12-03T12:24:56Z

Regression introduced in moby/buildkit@174bcf8 (moby/buildkit#1862)

thaJeztah · 2020-12-03T12:40:04Z

I opened moby/buildkit#1874 to revert the change

tiborvass · 2020-12-03T22:04:30Z

@AkihiroSuda Looks like the only containerd changes potentially affecting docker are containerd/containerd@126b35ca4 and containerd/containerd@fd01744a0. I'd rather get in the buildkit vendor to get the fix in, but I don't think it's that important to have containerd dependency update for this next release. We can update containerd dependencies here and in buildkit when we need it. Let me know if I'm missing something.

tiborvass · 2020-12-03T22:14:56Z

Updated to bring in the new buildkit fix from moby/buildkit#1874 and reverted the containerd bump in this PR.

thaJeztah · 2020-12-03T23:15:02Z

vendor.conf

looks like you removed the comment

I think i mixed the two, i wanted to remove it for buildkit not containerd.

thaJeztah · 2020-12-04T15:12:09Z

vendor.conf

Looks like there's no v0.8 branch yet, so wondering if this would be v0.8.1-dev ?

moby/buildkit@v0.8.0...950603d

generally speaking I believe -dev is not derived from patch number versions.

that's correct, this is more of a "manual" indication; alternatively v0.8.0-4-g950603da;

git checkout 950603da215ae03b843f3f66fbe86c4876a6f5a1 git describe --tags --match 'v*' v0.8.0-4-g950603da

Signed-off-by: Akihiro Suda <[email protected]> Signed-off-by: Tibor Vass <[email protected]>

AkihiroSuda

Thanks @tiborvass @thaJeztah

LGTM, bu I can't click "Approve" because this PR was initially my own

lbndev · 2020-12-09T23:35:17Z

Hello,

I've just ran "apt-get upgrade" on my CI, which upgraded docker to "Docker version 20.10.0, build 7287ab3".
Now builds are not passing anymore ("dockerfile parse error line xxx: ENTRYPOINT requires at least one argument") when the Dockerfile attempts to reset the entrypoint from the parent image using ENTRYPOINT [].

Probably the original commit made it into the release, but not the revert ? Or maybe it's just the packages on the apt repository which haven't been updated ? I'm installing from deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable

I'll revert to 19.03 for now.

Thanks

thaJeztah · 2020-12-10T00:13:07Z

@lbndev can you open a ticket with full output of docker info and docker version and an example Dockerfile if possible?

Trying to reproduce, but I don't see this problem;

DOCKER_BUILDKIT=1 docker build -t foo -<<'EOF'
FROM busybox
ENTRYPOINT []
EOF

[+] Building 0.1s (5/5) FINISHED
 => [internal] load build definition from Dockerfile                                                                               0.0s
 => => transferring dockerfile: 64B                                                                                                0.0s
 => [internal] load .dockerignore                                                                                                  0.0s
 => => transferring context: 2B                                                                                                    0.0s
 => [internal] load metadata for docker.io/library/busybox:latest                                                                  0.0s
 => [1/1] FROM docker.io/library/busybox                                                                                           0.0s
 => => resolve docker.io/library/busybox:latest                                                                                    0.0s
 => exporting to image                                                                                                             0.0s
 => => exporting layers                                                                                                            0.0s
 => => writing image sha256:c6301af1809013800e3d2fefe42a9a469ddd828bbfe61a23d84dc25f08c9a731                                       0.0s
 => => naming to docker.io/library/foo                                                                                             0.0s


DOCKER_BUILDKIT=0 docker build -t foo -<<'EOF'
FROM busybox
ENTRYPOINT []
EOF

Sending build context to Docker daemon  2.048kB
Step 1/2 : FROM busybox
 ---> 1c35c4412082
Step 2/2 : ENTRYPOINT []
 ---> Running in e6263564cd8a
Removing intermediate container e6263564cd8a
 ---> 0fe82f88eb6e
Successfully built 0fe82f88eb6e
Successfully tagged foo:latest

lbndev · 2020-12-10T08:48:45Z

@lbndev can you open a ticket with full output of docker info and docker version and an example Dockerfile if possible?

Done. Please see #41770.
Thanks @thaJeztah

AkihiroSuda mentioned this pull request Dec 3, 2020

vendor: BuildKit v0.8.0-rc2, containerd, and dependencies #41688

Merged

AkihiroSuda added this to the 20.10.0 milestone Dec 3, 2020

thaJeztah reviewed Dec 3, 2020

View reviewed changes

vendor.conf Outdated

Copy link

Member

thaJeztah Dec 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see a change in go.mod for buildkit, which is still at 0edc412565dc - perhaps do this separate?

thaJeztah mentioned this pull request Dec 3, 2020

Revert "Ensure ENTRYPOINT command has at least one argument" moby/buildkit#1874

Merged

tiborvass force-pushed the vendor-bk-080 branch from ae52cc7 to f92d74d Compare December 3, 2020 22:14

tiborvass changed the title ~~vendor: BuildKit v0.8.0~~ vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1 Dec 3, 2020

thaJeztah reviewed Dec 3, 2020

View reviewed changes

thaJeztah reviewed Dec 4, 2020

View reviewed changes

vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1

34682e5

Signed-off-by: Akihiro Suda <[email protected]> Signed-off-by: Tibor Vass <[email protected]>

tiborvass force-pushed the vendor-bk-080 branch from f92d74d to 34682e5 Compare December 4, 2020 21:43

AkihiroSuda commented Dec 5, 2020

View reviewed changes

tiborvass approved these changes Dec 5, 2020

View reviewed changes

tiborvass merged commit c40bef9 into moby:master Dec 5, 2020

lbndev mentioned this pull request Dec 10, 2020

Unable to reset entrypoint #41770

Closed

vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1 #41745

vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1 #41745

Uh oh!

Conversation

AkihiroSuda commented Dec 3, 2020 • edited by tiborvass Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Dec 3, 2020

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda commented Dec 3, 2020

Uh oh!

thaJeztah commented Dec 3, 2020

Uh oh!

thaJeztah commented Dec 3, 2020

Uh oh!

thaJeztah commented Dec 3, 2020

Uh oh!

tiborvass commented Dec 3, 2020

Uh oh!

tiborvass commented Dec 3, 2020

Uh oh!

thaJeztah Dec 3, 2020

Choose a reason for hiding this comment

Uh oh!

tiborvass Dec 4, 2020

Choose a reason for hiding this comment

Uh oh!

thaJeztah Dec 4, 2020

Choose a reason for hiding this comment

Uh oh!

tiborvass Dec 4, 2020

Choose a reason for hiding this comment

Uh oh!

thaJeztah Dec 4, 2020

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda left a comment

Choose a reason for hiding this comment

Uh oh!

lbndev commented Dec 9, 2020

Uh oh!

thaJeztah commented Dec 10, 2020

Uh oh!

lbndev commented Dec 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AkihiroSuda commented Dec 3, 2020 •

edited by tiborvass

Loading