0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
46085 commits 14 branches 412 tags 338 MiB
Commit graph

46085 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
96cfb076ce
libnetwork/netlabel: make consts actual consts 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 18:17:13 +01:00
Tianon Gravi
3a5598affa
Merge pull request #44381 from thaJeztah/strings_cut 
Replace uses of `strings.Split(N)` with `strings.Cut()`
 2022-12-21 09:16:05 -08:00
Sebastiaan van Stijn
36151bd1d7
libnetwork/drivers/bridge: remove "ioctl" fallback code for legacy kernels 
This code was forked from libcontainer (now runc) in
fb6dd9766e

From the description of this code:

> THIS CODE DOES NOT COMMUNICATE WITH KERNEL VIA RTNETLINK INTERFACE
> IT IS HERE FOR BACKWARDS COMPATIBILITY WITH OLDER LINUX KERNELS
> WHICH SHIP WITH OLDER NOT ENTIRELY FUNCTIONAL VERSION OF NETLINK

That comment was added as part of a refactor in;
4fe2c7a4db

Digging deeper into the code, it describes:

> This is more backward-compatible than netlink.NetworkSetMaster and
> works on RHEL 6.

That comment (and code) moved around a few times;

- moved into the libcontainer pkg: 6158ccad97
- moved within the networkdriver pkg: 4cdcea2047
- moved into the networkdriver pkg: 90494600d3

Ultimately leading to 7a94cdf8ed, which implemented
this:

> create the bridge device with ioctl
>
> On RHEL 6, creation of a bridge device with netlink fails.  Use the more
> backward-compatible ioctl instead.  This fixes networking on RHEL 6.

So from that information, it looks indeed to support RHEL 6, and Ubuntu 12.04
which are both EOL, and we haven't supported for a long time, so probably time
to remove this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 17:32:04 +01:00
Sebastiaan van Stijn
6a91e09218
pkg/parsers: use strings.Cut(), and cleanup error-messages 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
3f935d0e2c
daemon/graphdriver/zfs: use strings.Cut, and refactor 
Fixes a (theoretical?) panic if ID would be shorter than 12
characters. Also trim the ID _after_ cutting off the suffix.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
f95e9b68d6
daemon: use strings.Cut() and cleanup error messages 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
46f7c92c9a
libnetwork: use strings.Cut() and minor refactor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
87ca9490b0
libnetwork/datastore: rename var that collided with import 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
ff447f4fd5
runconfig/opts: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:03 +01:00
Sebastiaan van Stijn
bffb35612c
plugin: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
01365cbd74
libcontainerd/local: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
6059d38f21
pkg/parsers/operatingsystem: don't use strings.SplitN() 
We're looking for a specific prefix, so remove the prefix instead. Also remove
redundant error-wrapping, as `os.Open()` already provides details in the error
returned;

    open /no/such/file: no such file or directory
    open /etc/os-release: permission denied

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
451b8579ef
pkg/parsers/kernel: use strings.Cut() and minor refactor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
774cd9a26c
opts: use strings.Cut() and refactor parseDaemonHost() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
d3cd746067
integration-cli: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
38b0c47f37
integration-cli: links: use gotest.tools compare and assert.Check 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:02 +01:00
Sebastiaan van Stijn
ebda2fa2b5
integration/internal: use strings.Cut() and minor refactor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
39f59c3289
daemon/links: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
ad7f1a8dcc
daemon/logger: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
32c4c15f15
daemon/events: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
5008409b5c
cmd/dockerd: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
19cd5ff164
client: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:01 +01:00
Sebastiaan van Stijn
64adea1ce1
volume: use strings.Cut() and minor refactor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
19db33afc9
pkg/tarsum: use strings.Cut() and minor refactor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
59880cb855
builder/dockerfile: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
604a2d67b5
builder/remotecontext/git: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
380a2dfc3a
api/types: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
7841ce781c
api/types/time: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:09:00 +01:00
Sebastiaan van Stijn
ba9bcf92f6
api/types/filters: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:08:59 +01:00
Sebastiaan van Stijn
6db4af7bd5
graphdriver: windows: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:08:59 +01:00
Sebastiaan van Stijn
c545473920
daemon/cluster: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:08:57 +01:00
Sebastiaan van Stijn
ec878a3d89
pkg/sysinfo: unify ReadMemInfo implementation 
Use a single exported implementation, so that we can maintain the
GoDoc string in one place, and use non-exported functions for the
actual implementation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 10:53:45 +01:00
Sebastiaan van Stijn
09ea6744fe
pkg/sysinfo: remove github.com/docker/go-units dependency 
It was only used in a test, and only for a single const; define
it locally.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 10:53:45 +01:00
Sebastiaan van Stijn
6a516acb2e
pkg/system: move memory-info types to pkg/systeminfo 
These types and functions are more closely related to the functionality
provided by pkg/systeminfo, and used in conjunction with the other functions
in that package, so moving them there.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 10:53:45 +01:00
Sebastiaan van Stijn
6919b9879b
pkg/sysinfo: unify NumCPU implementation 
Use a single exported implementation, so that we can maintain the
GoDoc string in one place, and use non-exported functions for the
actual implementation (which were already in place).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 10:53:42 +01:00
Sebastiaan van Stijn
298d3aa8b8
Merge pull request #44515 from thaJeztah/move_ioutils_tempdir 
pkg/ioutils: TempDir: move to pkg/longpath
 2022-12-21 10:37:50 +01:00
Sebastiaan van Stijn
c63ea32a17
pkg/ioutils: TempDir: move to pkg/longpath 
This utility wasn't very related to all other utilities in pkg/ioutils.
Moving it to longpath to also make it more clear what it does.

It looks like there's only a single (public) external consumer of this
utility, and only used in a test, and it's not 100% clear if it was
intentional to use our package, of if it was a case of "I actually meant
`io/ioutil.MkdirTemp`" so we could consider skipping the alias.

While moving the package, I also renamed `TempDir` to `MkdirTemp`, which
is the signature it matches in "os" from stdlib.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-20 23:24:12 +01:00
Sebastiaan van Stijn
3314f4ef09
pkg/ioutils: unify TempDir implementation 
This allows us to maintain a single GoDoc string to describe
what it's used for.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-20 23:23:59 +01:00
Sebastiaan van Stijn
2e67c85c13
pkg/longpath: fix package GoDoc 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-20 23:23:59 +01:00
Sebastiaan van Stijn
c4c53659f1
integration-cli: remove uses of ioutils.TempDir 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-20 23:23:55 +01:00
Sebastiaan van Stijn
2e67c827bb
errdefs: FromStatusCode() don't log "FIXME" debug message 
This utility is used by the client, which cannot do anything about errors
received from the API. In situations where no API connection was possible,
for example, if the client has no permissions to connect to the socket,
the request would have a "-1" status-code;
3e39ec60da/client/request.go (L133-L134)

In this case, a client with "debug" enabled, would print _and_ log a confusing
error message:

    DEBU[0000] FIXME: Got an status-code for which error does not match any expected type!!!  error="Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Post \"http://%2Fvar%2Frun%2Fdocker.sock/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile.repro&labels=%7B%7D&memory=0&memswap=0&networkmode=default&rm=1&shmsize=0&t=repro&target=&ulimits=null&version=1\": dial unix /var/run/docker.sock: connect: permission denied" module=api status_code=-1
    Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile.repro&labels=%7B%7D&memory=0&memswap=0&networkmode=default&rm=1&shmsize=0&t=repro&target=&ulimits=null&version=1": dial unix /var/run/docker.sock: connect: permission denied

In the above; `DEBU` logs the error (including the "FIXME"), and the second
line is the error message printed.

This was a mistake on my side when I added the `FromStatusCode` utility. I
implemented that to be the counterpart to `FromError`, but in doing so also
copied over the logging (see 1af30c50ca). That
log-message is only intended to be logged on the daemon side, for situations
where we return an error without a proper errdefs (which would result in an
500 "internal server error" to be returned by the API).

This patch removes the debug log, and a minor cleanup to explicitly return
"nil" if we didn't get an error in the first place.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-20 16:03:46 +01:00
Sebastiaan van Stijn
3e39ec60da
Merge pull request #44674 from thaJeztah/vendor_containerd_1.6.14 
vendor: github.com/containerd/containerd v1.6.14
 2022-12-20 10:59:17 +01:00
Sebastiaan van Stijn
83d7ae76e8
vendor: github.com/containerd/containerd v1.6.14 
No changes in vendored code, other than the version bump

full diff: https://github.com/containerd/containerd/compare/v1.6.13...v1.6.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-19 22:44:40 +01:00
Sebastiaan van Stijn
72ea8cfb43
registry: use http.NewServeMux for tests instead of gorilla/mux 
We don't need gorilla/mux for these tests, so let's use stdlib.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-19 13:25:43 +01:00
Sebastiaan van Stijn
13b36ce063
Merge pull request #44661 from thaJeztah/optimize_stringid 
pkg/stringid: optimize performance
 2022-12-17 18:24:39 +01:00
Sebastiaan van Stijn
6371675bf9
Merge pull request #44275 from thaJeztah/move_pkg_system_funcs 
pkg/system: move some functions to a new home
 2022-12-16 15:25:41 +01:00
Sebastiaan van Stijn
54512f2184
pkg/stringid: optimize performance 
Had these laying around; not very critical as these functions are barely
used, but probably won't hurt:

    BenchmarkIsShortID-10       1447230     816.9 ns/op       0 B/op     0 allocs/op
    BenchmarkIsShortIDNew-10   10103319     101.9 ns/op       0 B/op     0 allocs/op
    BenchmarkValidateID-10        10000    112208 ns/op   33005 B/op    10 allocs/op
    BenchmarkValidateIDNew-10    653293      1737 ns/op   16534 B/op     6 allocs/op

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-16 14:44:52 +01:00
Sebastiaan van Stijn
b10de9186c
Merge pull request #44653 from thaJeztah/containerd_binary_1.7 
update containerd binary to v1.7.0-beta.1
 2022-12-16 12:33:47 +01:00
Sebastiaan van Stijn
c766258e9c
Merge pull request #44409 from corhere/libnetwork-test-sanity 
libnetwork: improve tests & fix some bugs
 2022-12-16 12:30:02 +01:00
Sebastiaan van Stijn
d20ddb6807
update containerd binary to v1.7.0-beta.1 
release notes: https://github.com/containerd/containerd/releases/tag/v1.7.0-beta.1

full diff: https://github.com/containerd/containerd/compare/v1.7.0-beta.0...v1.7.0-beta.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-15 23:10:18 +01:00