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

45448 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tianon Gravi
2b9de2e24a
Merge pull request #44809 from rumpl/containerd-image-history 
daemon/c8d: Implement image history
 2023-01-24 14:35:05 -08:00
Djordje Lukic
54f0b0ec4b c8d: Implement image history 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2023-01-23 16:50:02 +01:00
Bjorn Neergaard
65c371ed6e
Merge pull request #44842 from vvoland/c8d-fix-truncatedid 
c8d: Fix resolving truncated id to a descriptor
 2023-01-21 19:43:29 -07:00
Sebastiaan van Stijn
abdf23c6c0
Merge pull request #44853 from crazy-max/rm-install-suffix 
hack: remove -installsuffix build flag
 2023-01-20 18:25:50 +01:00
Bjorn Neergaard
22324ec288
Merge pull request #44852 from AkihiroSuda/rootless-ipc-host 
rootless: support `--ipc=host`
 2023-01-20 09:57:00 -07:00
Akihiro Suda
b3c5352386
rootless: support --ipc=host 
Fix issue 44294

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-01-21 01:00:27 +09:00
Sebastiaan van Stijn
40cc022c70
Merge pull request #44861 from crazy-max/fix-arm 
hack: check if cross-compiling before setting ARM target name
 2023-01-20 16:43:38 +01:00
CrazyMax
67aa86f1e0
hack: check if cross-compiling before setting ARM target name 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-20 15:13:11 +01:00
Sebastiaan van Stijn
95e207933d
Merge pull request #44857 from thaJeztah/bump_swarmkit 
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230119195359-904c221ac281
 2023-01-20 01:53:16 +01:00
Sebastiaan van Stijn
25f95b0000
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230119195359-904c221ac281 
full diff: 0da442b278...904c221ac2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-19 23:36:45 +01:00
Bjorn Neergaard
b34ffc99b8
Merge pull request #43112 from ningmingxiao/dev1 
fix blockThreshold full deadlock bug
 2023-01-19 14:23:44 -07:00
CrazyMax
170a1c4709
hack: display build cmd when DOCKER_DEBUG set 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-19 21:33:39 +01:00
CrazyMax
877baae03e
hack: remove unnecessary vars in make.sh script 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-19 21:33:38 +01:00
CrazyMax
b80f16157e
hack: remove ORIG_BUILDFLAGS var 
This var was used for the cross target but it has been removed
in 8086f40123 so not necessary anymore

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-19 21:33:38 +01:00
CrazyMax
0c008cc4f8
hack: remove -installsuffix build flag 
Has been introduced in 232d59baeb to work around a bug with
"go build" but not required anymore since go 1.5: 4dab6d01f1

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-19 21:33:38 +01:00
Bjorn Neergaard
0104f8f64a
Merge pull request #44854 from crazy-max/fix-arm64-build 
Dockerfile: prefer ld for building against arm64
 2023-01-19 13:22:52 -07:00
CrazyMax
d2d6ef431f
Dockerfile: prefer ld for building against arm64 
We already prefer ld for cross-building arm64 but that seems
not enough as native arm64 build also has a linker issue with lld
so we need to also prefer ld for native arm64 build.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-19 16:34:34 +01:00
Sebastiaan van Stijn
ed8782fe0a
Merge pull request #44841 from crazy-max/fix-static 
Dockerfile: use clang to build dockerd/docker-proxy
 2023-01-18 20:01:19 +01:00
CrazyMax
518be73a5c
Dockerfile: smoke tests for static builds 
Adds smoke test stage in our Dockerfile and a
GitHub Action workflow

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-18 18:46:53 +01:00
Kevin Alvarez
f676dab8dc
Dockerfile: use clang to build dockerd/docker-proxy 
Static binaries for dockerd are broken on armhf and armel (32-bit).
It seems to be an issue with GCC as building using clang solves
this issue. Also adds extra instruction to prefer ld for
cross-compiling arm64 in bullseye otherwise it doesn't link.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-18 18:46:52 +01:00
Sebastiaan van Stijn
f481f9333d
Merge pull request #44847 from gabriel-samfira/skip-lookup-on-windows 
Disable chrootarchive.init() on Windows
 2023-01-18 17:21:00 +01:00
Gabriel Adrian Samfira
f49c88f1c4
Disable chrootarchive.init() on Windows 
Disables user.Lookup() and net.LookupHost() in the init() function on Windows.

Any package that simply imports pkg/chrootarchive will panic on Windows
Nano Server, due to missing netapi32.dll. While docker itself is not
meant to run on Nano Server, binaries that may import this package and
run on Nano server, will fail even if they don't really use any of the
functionality in this package while running on Nano.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2023-01-18 16:34:13 +02:00
Sebastiaan van Stijn
17b2c89116
Merge pull request #44818 from vvoland/c8d-commit-ctx-upstream 
images: Pass context to commit related operations
 2023-01-18 15:17:52 +01:00
Nicolas De Loof
9b5c21309b
images: Pass context to commit related operations 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2023-01-18 12:23:32 +01:00
Paweł Gronowski
596c8960b2
c8d: Fix resolving truncated id to a descriptor 
Regular expression beginning anchor was placed after `sha256:` digest
prefix.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2023-01-18 12:10:07 +01:00
Bjorn Neergaard
d783e7df83
Merge pull request #44835 from AdallomRoy/master 
Add GetLibHome stub for non-linux OS
 2023-01-17 21:38:42 -07:00
Sebastiaan van Stijn
a7a6ac112e
Merge pull request #44836 from thaJeztah/bump_x_net 
vendor: golang.org/x packages
 2023-01-17 22:08:06 +01:00
Bjorn Neergaard
4f716c731a
Merge pull request #44812 from crazy-max/fix-arm-build 
hack: name for target ARM architecture not specified
 2023-01-17 12:00:40 -07:00
Sebastiaan van Stijn
65c6ba1fc4
vendor: golang.org/x/net v0.5.0 
contains a fix for CVE-2022-41721, although it probably does not affect us.

full diff: https://github.com/golang/net/compare/v0.4.0...v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-17 14:34:05 +01:00
Roy Reznik
ff14f8ef16 Add GetLibHome stub for non-linux OS 
Signed-off-by: Roy Reznik <roy@wiz.io>
 2023-01-17 15:28:08 +02:00
Sebastiaan van Stijn
824dc51341
vendor: golang.org/x/text v0.6.0 
full diff: https://github.com/golang/text/compare/v0.5.0...v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-17 14:16:10 +01:00
Sebastiaan van Stijn
e66e6bb28a
vendor: golang.org/x/sys v0.4.0 
full diff: https://github.com/golang/sys/compare/v0.3.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-17 14:09:18 +01:00
ningmingxiao
dcfe23a038 fix blockThreshold full bug 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2023-01-17 12:56:43 +08:00
Cory Snider
0b83fd3217 ioutils: add regression test for bytespipe deadlock 
Signed-off-by: Cory Snider <csnider@mirantis.com>
 2023-01-16 14:27:44 -05:00
Cory Snider
9052e33a10
Merge pull request #44825 from neersighted/reimplement_44706 
libnetwork: Support IPv6 in arrangeUserFilterRule() (redux)
 2023-01-16 12:20:24 -05:00
CrazyMax
71fa3b1337
Dockerfile: fix PKG_CONFIG for xx 
Current implementation in hack/make.sh overwrites PKG_CONFIG
if not defined and set it to pkg-config. When a build is invoked
using xx in our Dockerfile, it will set PKG_CONFIG to the right
value in go environments depending on the target architecture: 8015613ccc/base/xx-go (L75-L78)

Also needs to install dpkg-dev to use pkg-config when cross-building

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-16 11:42:13 +01:00
Kevin Alvarez
945704208a
hack: name for target ARM architecture not specified 
Build currently doesn't set the right name for target ARM
architecture through switches in CGO_CFLAGS and CGO_CXXFLAGS
when doing cross-compilation. This was previously fixed in https://github.com/moby/moby/pull/43474

Also removes the toolchain configuration. Following changes for
cross-compilation in https://github.com/moby/moby/pull/44546,
we forgot to remove the toolchain configuration that is
not used anymore as xx already sets correct cc/cxx envs already.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-16 11:40:47 +01:00
CrazyMax
94639eb66f
hack: typo in displayed platform name 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-16 11:40:47 +01:00
Albin Kerouanton
ffd75c2e0c
libnetwork: Support IPv6 in arrangeUserFilterRule() (redux) 
This reapplies commit 2d397beb00.

Fixes #44451.

Co-authored-by: Bjorn Neergaard <bneergaard@mirantis.com>
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-01-14 19:11:44 -07:00
Bjorn Neergaard
98c1140c44
Merge pull request #44824 from neersighted/revert_44706 
Revert "libnetwork: Support IPv6 in arrangeUserFilterRule()"
 2023-01-14 17:14:26 -07:00
Bjorn Neergaard
17723691e5
Revert "libnetwork: Support IPv6 in arrangeUserFilterRule()" 
This reverts commit 2d397beb00.

moby#44706 and moby#44805 were both merged, and both refactored the same
file. The combination broke the build, and was not detected in CI as
only the combination of the two, applied to the same parent commit,
caused the failure.

moby#44706 should be carried forward, based on the current master, in
order to resolve this conflict.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-01-14 15:31:56 -07:00
Bjorn Neergaard
803c21f4b2
Merge pull request #44706 from akerouanton/fix-44451 
libnetwork: Support IPv6 in arrangeUserFilterRule()
 2023-01-14 15:18:01 -07:00
Bjorn Neergaard
eb20ed1f69
Merge pull request #44789 from jg-public/specspath-to-registry 
plugins: Move SpecPaths into LocalRegistry
 2023-01-14 15:09:12 -07:00
Bjorn Neergaard
d62a88eb0d
Merge pull request #44822 from thaJeztah/update_ipvs 
vendor: github.com/moby/ipvs v1.1.0
 2023-01-14 14:58:52 -07:00
Bjorn Neergaard
2cff71d71c
Merge pull request #44788 from jg-public/homedir-fallback 
homedir: fallback to getpwent(3) if XDG_XX_HOME and HOME are unset
 2023-01-14 14:57:06 -07:00
Jan Garcia
833096ce42 homedir: fallback to user.Current().homeDir if XDG_DATA_HOME/XDG_CONFIG_HOME and HOME are unset 
Signed-off-by: Jan Garcia <github-public@n-garcia.com>
 2023-01-14 17:38:34 +01:00
Sebastiaan van Stijn
af6b5d55db
vendor: github.com/moby/ipvs v1.1.0 
full diff: https://github.com/moby/ipvs/compare/v1.0.2...v1.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-14 17:25:22 +01:00
Sebastiaan van Stijn
f53feeea8b
vendor: github.com/vishvananda/netns v0.0.2 
full diff: https://github.com/vishvananda/netns/compare/v0.0.1...v0.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-01-14 17:23:50 +01:00
Akihiro Suda
219ced474d
Merge pull request #44819 from thaJeztah/bump_netns 
vendor: github.com/vishvananda/netns v0.0.1
 2023-01-14 08:45:44 +09:00
Cory Snider
2504e4ad0d
Merge pull request #44805 from corhere/libnet/return-concrete-types 
libnetwork: replace some unnecessary interfaces with their concrete types
 2023-01-13 17:00:37 -05:00