Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Feb 7, 2023

see individual commits for details

@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 15, 2023

One failure;

#19 62.71 === FAIL: cli/command/container TestParseModes (0.00s)
#19 62.71     opts_test.go:613: assertion failed: expected an error, got nil

func TestParseModes(t *testing.T) {
// pid ko
flags, copts := setupRunFlags()
args := []string{"--pid=container:", "img", "cmd"}
assert.NilError(t, flags.Parse(args))
_, err := parse(flags, copts, runtime.GOOS)
assert.ErrorContains(t, err, "--pid: invalid PID mode")

Looks like a regression in moby/moby@e7d75c8 ( moby/moby#44379), as (unlike other options) PidMode did not allow an empty container name/ID (container:)

@thaJeztah
Copy link
Member Author

Hm... something broke; could be related to moby/moby#45086 ?

#0 1.879 cmd/docker/builder.go
#0 1.880 cmd/docker/builder_test.go
#0 1.880 cmd/docker/builder_windows_test.go
#0 1.881 cmd/docker/completions.go
#0 1.881 cmd/docker/docker.go
#0 1.882 cmd/docker/docker_test.go
#0 1.882 cmd/docker/docker_windows_arm64.go
#0 2.117 + go build -o /out/docker-windows-arm64.exe -tags ' osusergo' -ldflags ' -X "github.com/docker/cli/cli/version.GitCommit=f729c42eb2" -X "github.com/docker/cli/cli/version.BuildTime=2023-03-15T14:13:14Z" -X "github.com/docker/cli/cli/version.Version=23.0.0-54-gf729c42eb2.m"' github.com/docker/cli/cmd/docker
#75 331.3 # github.com/docker/cli/cli/trust
#75 331.3 cli/trust/trust.go:314:11: invalid operation: rs != nil (mismatched types "github.com/docker/cli/vendor/github.com/docker/docker/registry".Service and untyped nil)

@thaJeztah thaJeztah force-pushed the update_engine_23.1 branch from 7699b51 to 0b7ad37 Compare March 15, 2023 16:08
@codecov-commenter
Copy link

codecov-commenter commented Mar 15, 2023

Codecov Report

Merging #4010 (2784091) into master (adbfa82) will increase coverage by 0.02%.
The diff coverage is 46.15%.

❗ Current head 2784091 differs from pull request most recent head 7189716. Consider uploading reports for the commit 7189716 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4010      +/-   ##
==========================================
+ Coverage   59.09%   59.12%   +0.02%     
==========================================
  Files         285      287       +2     
  Lines       24739    24745       +6     
==========================================
+ Hits        14620    14630      +10     
+ Misses       9234     9230       -4     
  Partials      885      885              

@thaJeztah
Copy link
Member Author

Hmm... interesting failure - concurrent access perhaps?

 make -f docker.Makefile vendor
docker buildx bake --set "*.output=/var/folders/6f/tz5jf4nn1_n5jb0ctrrw5p2w0000gn/T/dockercli-output.XXXXXXXXXX.WAnu0rNq" update-vendor
[+] Building 13.0s (10/11)
 => [internal] load build definition from Dockerfile.vendor                                                                                                                                                                          0.0s
 => => transferring dockerfile: 1.07kB                                                                                                                                                                                               0.0s
 => [internal] load .dockerignore                                                                                                                                                                                                    0.0s
 => => transferring context: 263B                                                                                                                                                                                                    0.0s
 => resolve image config for docker.io/docker/dockerfile:1                                                                                                                                                                           3.1s
 => CACHED docker-image://docker.io/docker/dockerfile:1@sha256:39b85bbfa7536a5feceb7372a0817649ecb2724562a38360f4d6a7782a409b14                                                                                                      0.0s
 => => resolve docker.io/docker/dockerfile:1@sha256:39b85bbfa7536a5feceb7372a0817649ecb2724562a38360f4d6a7782a409b14                                                                                                                 0.0s
 => [internal] load metadata for docker.io/library/golang:1.19.7-alpine3.16                                                                                                                                                          2.0s
 => [base 1/3] FROM docker.io/library/golang:1.19.7-alpine3.16@sha256:dc189dcfcea54267261d8b93d59d1041ab6a076d7a3e7a30c498055d3f660260                                                                                               0.0s
 => => resolve docker.io/library/golang:1.19.7-alpine3.16@sha256:dc189dcfcea54267261d8b93d59d1041ab6a076d7a3e7a30c498055d3f660260                                                                                                    0.0s
 => [internal] load build context                                                                                                                                                                                                    0.8s
 => => transferring context: 32.77MB                                                                                                                                                                                                 0.8s
 => CACHED [base 2/3] RUN apk add --no-cache bash git rsync                                                                                                                                                                          0.0s
 => CACHED [base 3/3] WORKDIR /src                                                                                                                                                                                                   0.0s
 => ERROR [vendored 1/1] RUN --mount=target=/context     --mount=target=.,type=tmpfs      --mount=target=/go/pkg/mod,type=cache <<EOT (set -e...)                                                                                    6.8s
------
 > [vendored 1/1] RUN --mount=target=/context     --mount=target=.,type=tmpfs      --mount=target=/go/pkg/mod,type=cache <<EOT (set -e...):
#0 1.199 + go mod tidy -compat=1.18 -modfile=vendor.mod
#0 6.658 go: errors parsing go.mod:
#0 6.658 vendor.mod:21: replace github.com/thaJeztah/docker: version "pass_useragent_as_header" invalid: git fetch --unshallow -f origin in /go/pkg/mod/cache/vcs/cc6b4a41036500dcf4a91d94af0fe8006ba45eac167bbd77cfca5e7fe0b22534: exit status 128:
#0 6.658 	fatal: Unable to create '/go/pkg/mod/cache/vcs/cc6b4a41036500dcf4a91d94af0fe8006ba45eac167bbd77cfca5e7fe0b22534/shallow.lock': File exists.
#0 6.658
#0 6.658 	Another git process seems to be running in this repository, e.g.
#0 6.658 	an editor opened by 'git commit'. Please make sure all processes
#0 6.658 	are terminated then try again. If it still fails, a git process
#0 6.658 	may have crashed in this repository earlier:
#0 6.658 	remove the file manually to continue.
------
Dockerfile.vendor:13
--------------------
  12 |     ENV GOPROXY=direct
  13 | >>> RUN --mount=target=/context \
  14 | >>>     --mount=target=.,type=tmpfs  \
  15 | >>>     --mount=target=/go/pkg/mod,type=cache <<EOT
  16 | >>> set -e
  17 | >>> rsync -a /context/. .
  18 | >>> ./scripts/vendor update
  19 | >>> mkdir /out
  20 | >>> cp -r vendor.mod vendor.sum vendor /out
  21 | >>> EOT
  22 |
--------------------
ERROR: failed to solve: process "/bin/sh -c set -e\nrsync -a /context/. .\n./scripts/vendor update\nmkdir /out\ncp -r vendor.mod vendor.sum vendor /out\n" did not complete successfully: exit code: 1
make: *** [vendor] Error 1

@thaJeztah thaJeztah force-pushed the update_engine_23.1 branch 4 times, most recently from 976e78c to f1bf107 Compare March 22, 2023 13:52
@thaJeztah thaJeztah force-pushed the update_engine_23.1 branch 3 times, most recently from 74bcaeb to 01de116 Compare March 30, 2023 16:52
@thaJeztah thaJeztah changed the title [WIP] vendor: update docker/docker to master vendor: update docker/docker to master (v24.0.0-dev) Mar 30, 2023
@thaJeztah thaJeztah added this to the v-next milestone Mar 30, 2023
@thaJeztah thaJeztah force-pushed the update_engine_23.1 branch from 01de116 to 2784091 Compare March 30, 2023 16:55
full diff: opencontainers/runc@v1.1.3...v1.1.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: https://github.com/golang/sys/compare/v0.5.0..v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: darccio/mergo@v0.3.12...v0.3.13

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: klauspost/compress@v1.15.12...v1.16.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: moby/buildkit@v0.11.4...v0.11.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- updates VolumeList() calls for docker/docker master
- update fakeClient signature, and suppress err output in tests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the update_engine_23.1 branch from 2784091 to 7189716 Compare March 30, 2023 17:58
@thaJeztah thaJeztah marked this pull request as ready for review March 30, 2023 19:10
@thaJeztah thaJeztah merged commit de0d30f into docker:master Mar 30, 2023
@thaJeztah thaJeztah deleted the update_engine_23.1 branch March 30, 2023 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants