Debian Patches

Status for docker.io/20.10.25+dfsg1-2

Patch Description Author Forwarded Bugs Origin Last update
debian-bash-completion-no-shebang.patch Remove shebang from bash completion file Discussed upstream, rejected as most code editors rely on the shebang
to correctly indent and highlight the file.

===================================================================
Arnaud Rebillout <elboulangero@gmail.com> yes 2020-11-27
debian-systemd-unit-tasksmax.patch [PATCH] docker.service: don't limit tasks

===================================================================
Pierre Carrier <pierre@meteor.com>, Tianon Gravi <tianon@debian.org> no https://github.com/docker/docker/pull/21491 2016-03-24
debian-systemd-unit-environment-file.patch Use EnvironmentFile with the systemd unit file.
===================================================================
Paul R. Tagliamonte <paultag@debian.org> no debian 2014-05-07
debian-dockerd-binary-location.patch FHS compliance.
===================================================================
not-needed
debian-cgroupfs-mount-convenience-copy.patch remove convenience copies of cgroupfs-mount in init.d / upstart
===================================================================
Tianon Gravi <admwiggin@gmail.com> not-needed debian
debian-nuke-no-prompt.patch remove prompt and delay
===================================================================
Dmitry Smirnov <onlyjob@debian.org> not-needed debian 2018-06-09
cli-add-go.mod-file.patch Add go.mod file to cli
Fix build issue during tests with
+ gotest.tools/v3
Arnaud Rebillout <elboulangero@gmail.com> no 2020-11-24
cli-dont-duplicate-authconfig.patch Prevent reverse build-deps nomad and gitlab-runner to FTBFS
~~~~ gitlab-runner
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:102:22: cannot use config.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to addAll
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:130:2: cannot use newAuths (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in return argument
src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:144:26: cannot use newAuths (type "github.com/docker/cli/cli/config/types".AuthConfig)
~~~~

~~~~ nomad
src/github.com/hashicorp/nomad/drivers/docker/utils.go:118:57: cannot use cfile.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to "github.com/docker/docker/registry".ResolveAuthConfig
~~~~

Please update this patch when upstream provides a fix.


===================================================================
Arnaud Rebillout <arnaud.rebillout@collabora.com> not-needed
engine-add-go.mod-file.patch Add go.mod file to engine
Fix build issue with
+ github.com/coreos/go-systemd/v22
+ gotest.tools/v3
Arnaud Rebillout <elboulangero@gmail.com> no 2020-11-24
engine-build-against-containerd-v1.5.2.patch vendor: github.com/containerd/containerd v1.5.2
full diff: https://github.com/containerd/containerd/compare/19ee068f93c91f7b9b2a858457f1af2cabc7bc06...v1.5.2
Sebastiaan van Stijn <github@gone.nl> no upstream, https://github.com/moby/moby/commit/7c1c1235 2021-06-04
engine-build-against-runc-1.0.patch replace uses of deprecated libcontainer/configs.Device


===================================================================
no backport, https://github.com/moby/moby/commit/d414c0c1e8c487170b1d2f5af4946771645c6564 2021-10-11
engine-seccomp-mipsx.patch =================================================================== no upstream, https://github.com/moby/moby/pull/43005
engine-systemd-service-after-containerd.patch Order docker.service after containerd.service Fixes proper shutdown of containers.
and https://github.com/moby/moby/pull/42622

===================================================================
no debian upstream, cherry-picked parts of https://github.com/moby/moby/pull/42373
engine-buildkit-image-spec-platform.patch [PATCH] Update uses of Image platform fields in OCI image-spec
diff --git a/engine/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/image.go b/engine/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/image.go
index f6e667f899a9..70d81262bcf2 100644
Sebastiaan van Stijn <github@gone.nl> no https://github.com/moby/buildkit/pull/3104
libnetwork-add-go.mod-file.patch Add go.mod file to libnetwork
Fix build issue with
+ github.com/godbus/dbus/v5
Arnaud Rebillout <elboulangero@gmail.com> no 2020-11-24
libnetwork_proto.patch fix generation of .pb.go files.
===================================================================
Dmitry Smirnov <onlyjob@debian.org> not-needed 2018-06-15
libnetwork_proto_no_unrecognized_all.patch Since gogo/protobuf 1.2 unknown fields in proto3 are preserved. This results in a XXX_unrecognized of type []byte to be created in the struct.
As a side effect the struct can't be used as a map key anymore, resulting in
a libnetwork build failure.

Fix this by setting goproto_unrecognized_all=false which suppresses this field.

Upstream doesn't have the problem because they have pinned an older version
of gogo/protobuf: https://github.com/docker/libnetwork/pull/2242

===================================================================
Felix Geyer <fgeyer@debian.org> no
test--cli-skip-network-tests.patch cli/command: Skip network tests Interestingly, the last time I tried, only the test
'TestRunBuildFromGitHubSpecialCase' failed, and it failed only
for the armel architecture. Which makes absolutely no sense,
given that it's supposed to fail when there's no network, and
it should have nothing to do with the architecture.
.
Anyway. Let's disable this test.
.
Build error below:
.
=== FAIL: cli/command/image TestRunBuildFromGitHubSpecialCase (0.10s)
Error: unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: fatal: unable to access 'https://github.com/docker/for-win/': Couldn't connect to server
: exit status 128
build_test.go:136: assertion failed: expected error to contain "docker-build-git", got "unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: fatal: unable to access 'https://github.com/docker/for-win/': Couldn't connect to server\n: exit status 128"

===================================================================
Dmitry Smirnov <onlyjob@debian.org> not-needed 2020-11-27
test--cli-skip-TestRunLabel.patch [PATCH] Disable unreliable test, failing randomly on multiple architectures

Starting from docker 19.03.12, this test fails on some buildd
architectures. It succeeds on my machine though.

It *seems* that there is no change between docker 19.03.11 and docker
19.03.12, regarding this part of the code.

So it could be due to a change in the golang package. docker 19.03.11
was built with `golang-1.14-src amd64 1.14.4-1`, while 19.03.12 is now
built with `golang-1.14-src amd64 1.14.4-2`. However, looking at the
difference between both, once again there's no significant difference.

So let's disable this particular test, out of a better solution.

Buildd logs can be found at:
- https://buildd.debian.org/status/fetch.php?pkg=docker.io&arch=amd64&ver=19.03.12%2Bdfsg1-2&stamp=1594609442&raw=0
- https://buildd.debian.org/status/fetch.php?pkg=docker.io&arch=arm64&ver=19.03.12%2Bdfsg1-2&stamp=1594609440&raw=0

~~~~
=== FAIL: cli/command/container TestRunLabel (unknown)
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x28 pc=0xb8c802]

goroutine 194 [running]:
net/http.(*Client).deadline(0x0, 0x8, 0x14752e5, 0xa)
/usr/lib/go-1.14/src/net/http/client.go:189 +0x22
net/http.(*Client).do(0x0, 0xc0000f0100, 0x0, 0x0, 0x0)
/usr/lib/go-1.14/src/net/http/client.go:585 +0x2ae
net/http.(*Client).Do(...)
/usr/lib/go-1.14/src/net/http/client.go:567
github.com/docker/docker/client.(*Client).doRequest(0xc00037af00, 0x16027c0, 0xc00027c180, 0xc0000f0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, ...)
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/docker/client/request.go:134 +0x151
github.com/docker/docker/client.(*Client).sendRequest(0xc00037af00, 0x16027c0, 0xc00027c180, 0x146e9fd, 0x4, 0xc000492000, 0x13, 0xc000067d08, 0x0, 0x0, ...)
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/docker/client/request.go:122 +0x14e
github.com/docker/docker/client.(*Client).post(0xc00037af00, 0x16027c0, 0xc00027c180, 0xc000492000, 0x13, 0xc000067d08, 0x0, 0x0, 0x0, 0x0, ...)
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/docker/client/request.go:46 +0x15a
github.com/docker/docker/client.(*Client).ContainerKill(0xc00037af00, 0x16027c0, 0xc00027c180, 0x146e257, 0x2, 0x146e48f, 0x3, 0x0, 0x0)
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/docker/client/container_kill.go:13 +0x1da
github.com/docker/cli/cli/command/container.ForwardAllSignals.func1(0xc0003d40c0, 0x1614c60, 0xc00000c1e0, 0x16027c0, 0xc00027c180, 0x146e257, 0x2)
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/cli/cli/command/container/tty.go:120 +0x294
created by github.com/docker/cli/cli/command/container.ForwardAllSignals
/<<PKGBUILDDIR>>/.gopath/src/github.com/docker/cli/cli/command/container/tty.go:103 +0xb1
~~~~

===================================================================
Arnaud Rebillout <elboulangero@gmail.com> not-needed 2020-07-13
test--cli-skip-TestSignCommandLocalFlag.patch Skip TestSignCommandLocalFlag
No idea why this test used to pass before and fails now...

~~~~
=== RUN TestSignCommandLocalFlag
--- FAIL: TestSignCommandLocalFlag (35.01s)
sign_test.go:307: assertion failed: expected error to contain "error contacting notary server: dial tcp: lookup reg-name.io",
got "Error: error contacting notary server: dial tcp 125.235.4.59:443: i/o timeout"
...
FAIL github.com/docker/cli/cli/command/trust 49.235s
~~~~


===================================================================
Arnaud Rebillout <arnaud.rebillout@collabora.com> not-needed vendor, Debian 2019-09-28
test--skip-daemon-oci-linux-pbuilder-tests.patch Skip test in pbuilder

===================================================================
Arnaud Rebillout <elboulangero@gmail.com> not-needed 2020-12-01
test--skip-pkg-signal-flaky-tests.patch Skip some pkg/signal linux tests
Issue mentioned upstream at <https://github.com/moby/moby/pull/40353>,
there was a tentative fix at <https://github.com/moby/moby/pull/40496>,
but the issue is still present.

=== Failed
=== FAIL: pkg/signal TestCatchAll (0.00s)
signal_linux_test.go:32: assertion failed: urgent I/O condition (string) != hangup (string)
signal_linux_test.go:32: assertion failed: hangup (string) != child exited (string)
signal_linux_test.go:32: assertion failed: child exited (string) != illegal instruction (string)
signal_linux_test.go:32: assertion failed: illegal instruction (string) != floating point exception (string)
signal_linux_test.go:32: assertion failed: floating point exception (string) != child exited (string)

===================================================================
Arnaud Rebillout <elboulangero@gmail.com> no 2020-12-09
test--skip-pkg-system-chtimes-mips64.patch Skip pkg/system chtimes tests on mips64
=== RUN TestChtimesLinux
chtimes_linux_test.go:87: Expected: 2262-04-11 23:47:16 +0000 UTC, got: 1990-01-27 10:50:44 +0000 UTC
--- FAIL: TestChtimesLinux (0.00s)
=== RUN TestChtimes
chtimes_test.go:92: Expected: 2262-04-11 23:47:16 +0000 UTC, got: 1990-01-27 10:50:44 +0000 UTC
--- FAIL: TestChtimes (0.00s)


===================================================================
Arnaud Rebillout <elboulangero@gmail.com> yes upstream 2021-01-04
test--skip-TestGetRootUIDGID.patch disable test failing is sbuild.~~~~
FAIL: TestGetRootUIDGID (0.00s)
idtools_unix_test.go:287:
Error Trace: idtools_unix_test.go:287
Error: Not equal:
expected: 1009
actual : 2952
Test: TestGetRootUIDGID
~~~~

===================================================================
Dmitry Smirnov <onlyjob@debian.org> not-needed 2018-06-16
test--skip-TestStateRunStop.patch disabled unreliable test.~~~~
state_test.go:102: ExitCode -1, expected 2, err "context deadline exceeded"
~~~~

===================================================================
Dmitry Smirnov <onlyjob@debian.org> not-needed 2018-08-02
avoid-consul.patch =================================================================== no
engine-client-dummy-hostname.patch client: define a "dummy" hostname to use for local connections no debian backport, https://github.com/moby/moby/pull/45972 2023-07-17

All known versions for source package 'docker.io'

Links