Commit graph

36619 commits

Author SHA1 Message Date
Sebastiaan van Stijn
6345208b9b
Replace some checkers and assertions with gotest.tools
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 16:45:37 +02:00
Sebastiaan van Stijn
86f2ac4a6b
Remove some checkers to discourage usage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 15:22:10 +02:00
Sebastiaan van Stijn
9819f9ef47
Merge pull request #39002 from crosbymichael/remove-status
Remove libcontainerd status type
2019-04-05 02:20:52 +02:00
Michael Crosby
45e328b0ac Remove libcontainerd status type
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-04 15:17:13 -04:00
Akihiro Suda
dbe4a30928
Merge pull request #38997 from thaJeztah/bump_selinux
bump opencontainers/selinux v1.2.1
2019-04-04 16:59:23 +09:00
Akihiro Suda
1ffde4c4eb
Merge pull request #38998 from thaJeztah/bump_logrus
bump sirupsen/logrus v1.4.1
2019-04-04 16:46:02 +09:00
Sebastiaan van Stijn
a38d8b0730
bump sirupsen/logrus v1.4.1
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 21:52:58 +02:00
Sebastiaan van Stijn
606ac478ad
bump opencontainers/selinux v1.2.1
full diff: https://github.com/opencontainers/selinux/compare/v1.2...v1.2.1

brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 21:45:22 +02:00
Tõnis Tiigi
bcaa613d82
Merge pull request #38983 from thaJeztah/bump_libnetwork
bump libnetwork to ebcade70ad1059b070d0040d798ecca359bc5fed
2019-04-03 10:26:47 -07:00
Tõnis Tiigi
c99acc616e
Merge pull request #38996 from AkihiroSuda/rootlesskit-030
bump up rootlesskit
2019-04-03 08:34:32 -07:00
Sebastiaan van Stijn
a2fdfaa830
Merge pull request #38819 from AkihiroSuda/fix-logs-docs
api: fix description about logs
2019-04-03 17:11:51 +02:00
Akihiro Suda
cf508036aa
Merge pull request #38994 from tonistiigi/update-buildkit
vendor: update buildkit to b3028967a
2019-04-03 20:12:12 +09:00
Akihiro Suda
c458822887 bump up rootlesskit
Changes: ed26714429...70e0502f32

Contains the fix for running RootlessKit+VPNKit instances simultaneously with multiple users: https://github.com/rootless-containers/rootlesskit/issues/56

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-04-03 20:08:50 +09:00
Tonis Tiigi
b6aae9919f vendor: update buildkit to b3028967a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-03 01:01:01 -07:00
Tibor Vass
c12f09bf99
Merge pull request #38991 from tonistiigi/mirrors-validation
daemon: fix mirrors validation
2019-04-02 19:52:10 -07:00
Tibor Vass
a0d64a3093
Merge pull request #38913 from AkihiroSuda/rootlesskit-docker-proxy
rootless: expose ports automatically
2019-04-02 19:51:15 -07:00
Tõnis Tiigi
7a337ec3c4
Merge pull request #38990 from tiborvass/http-grpc
Add undocumented /grpc endpoint and register BuildKit's controller
2019-04-02 18:13:13 -07:00
Tibor Vass
05c5d20a2c grpc: register BuildKit controller to /grpc
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-04-02 19:57:59 +00:00
Tibor Vass
e8382ece65 api: add undocumented /grpc endpoint to talk to GRPC services
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-04-02 19:57:59 +00:00
Tonis Tiigi
1a0f04e08e daemon: fix mirrors validation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-02 11:38:21 -07:00
Kirill Kolyshkin
0133041c18
Merge pull request #38977 from thaJeztah/fix_parseinfofile_parsing
fix parseInfoFile does not handle spaces in filenames
2019-04-02 09:29:15 -07:00
Tibor Vass
4067f3fb4c
Merge pull request #38984 from thaJeztah/disable_TestCheckpoint
Temporarily disable TestCheckpoint
2019-04-02 08:25:19 -07:00
Sebastiaan van Stijn
58d862574c
fix parseInfoFile does not handle spaces in filenames
`/proc/self/mountinfo` uses `\040` for spaces, however, `parseInfoFile()`
did not decode those spaces in paths, therefore attempting to use `\040`
as a literal part of the path.

This patch un-quotes the `root` and `mount point` fields to fix
situations where paths contain spaces.

Note that the `mount source` field is not modified, given that
this field is documented (man `PROC(5)`) as:

    filesystem-specific information or "none"

Which I interpreted as "the format in this field is undefined".

Reported-by: Daniil Yaroslavtsev <daniilyar@users.noreply.github.com>
Reported-by: Nathan Ringo <remexre@gmail.com>
Based-on-patch-by: Diego Becciolini <itizir@users.noreply.github.com>
Based-on-patch-by: Sergei Utinski <sergei-utinski@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-02 13:09:26 +02:00
Akihiro Suda
d2281bbfa3 api: fix description about logs
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-04-02 19:06:14 +09:00
Sebastiaan van Stijn
23fec5025d
Temporarily disable TestCheckpoint
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-01 22:07:48 +02:00
Tibor Vass
32157f9b12
Merge pull request #38959 from Microsoft/jjh/bumphcsshim
Vendor Microsoft/hcsshim@ba3d6667
2019-04-01 11:29:46 -07:00
Tibor Vass
09d0f91556
Merge pull request #38945 from RenaudWasTaken/master
Update nvidia_devices to call into nvidia-container-runtime-hook
2019-04-01 11:07:05 -07:00
Sebastiaan van Stijn
3ab093d567
bump libnetwork to ebcade70ad1059b070d0040d798ecca359bc5fed
full diff: 1a06131fb8...ebcade70ad

relevant changes:

- docker/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- docker/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- docker/libnetwork#2230 Moving IPVLAN driver out of experimental
- docker/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- docker/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- docker/libnetwork#2325 Fix possible nil pointer exception
- docker/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- docker/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-01 19:40:09 +02:00
Tibor Vass
739adb46e4 daemon: fix bug in nvidia device registration
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-03-29 16:07:01 -07:00
Renaud Gaubert
bd3d46a9e5 Update nvidia_devices to call into nvidia-container-runtime-hook
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
2019-03-29 16:07:01 -07:00
Tianon Gravi
d7ab8ad145
Merge pull request #38957 from ajatkj/mkimage-yum-update
mkimage yum update
2019-03-29 14:28:28 -07:00
Ankit Jain
eb13758057 Default to Core group only if no groups specified
Signed-off-by: Ankit Jain <ajatkj@yahoo.co.in>
2019-03-29 20:21:33 +05:30
Brian Goff
3f08ab936f
Merge pull request #38965 from thaJeztah/bump_cgroups
update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
2019-03-28 22:26:34 -07:00
Brian Goff
ab47e16cc5
Merge pull request #38918 from thaJeztah/bump_selinux
bump opencontainers/selinux to v1.2
2019-03-28 17:27:03 -07:00
Sebastiaan van Stijn
7392abda03
update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
full diff: dbea6f2bd4...4994991857

brings in https://github.com/containerd/cgroups/pull/79 Return ErrCgroupDeleted when no subsystems
relates to https://github.com/containerd/containerd/issues/3133 Custom cgroup path does not work in containerd 1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-29 00:00:06 +01:00
Ankit Jain
8233910503 mkimage-yum.sh: handle spaces properly & allow mutiple packages & groups
Signed-off-by: Ankit Jain <ajatkj@yahoo.co.in>
2019-03-28 20:47:47 +05:30
John Howard
b2488120ff Vendor Microsoft/hcsshim@ba3d6667
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-27 14:12:40 -07:00
Vincent Demeester
da823cf3a5
Merge pull request #38853 from cyphar/integration-cli-ensureImage
integration-cli: don't build -test images if they already exist
2019-03-27 07:32:23 +01:00
Akihiro Suda
333d5c2d4a
Merge pull request #38937 from thaJeztah/bump_swarmkit
bump swarmkit 18e7e58ea1a5ec016625a636d0d52500eea123bc
2019-03-27 14:04:48 +09:00
Sebastiaan van Stijn
be7ac8be2a
Merge pull request #38944 from andrewhsu/gitutils
gitutils: add validation for ref
2019-03-27 02:03:47 +01:00
Tonis Tiigi
a588898f99 gitutils: add validation for ref
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 723b107ca4fba14580a6cd971e63d8af2e7d2bbe)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-03-26 22:05:46 +00:00
Sebastiaan van Stijn
639880e6eb
Merge pull request #38933 from yongtang/gofmt
Small gofmt fix
2019-03-26 20:24:29 +01:00
Sebastiaan van Stijn
a356c4eaee
bump swarmkit 18e7e58ea1a5ec016625a636d0d52500eea123bc
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-26 14:57:19 +01:00
Yong Tang
269cba2428 Small gofmt fix
This PR is a small gofmt fix of https://goreportcard.com/report/github.com/moby/moby#gofmt
```
gofmt99%
Gofmt formats Go programs. We run gofmt -s on your code, where -s is for the "simplify" command
moby/integration-cli/docker_cli_run_test.go
Line 1: warning: file is not gofmted with -s (gofmt)
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2019-03-26 01:54:31 +00:00
Yong Tang
5635c248cd
Merge pull request #38871 from crosbymichael/exec-spec
Use original process spec for execs
2019-03-25 11:58:33 +08:00
Sebastiaan van Stijn
e4cc3adf81
Merge pull request #38922 from Microsoft/jjh/grantvmgroupaccess
LCOW: Add VMGroup SID to layer.vhd; fix layer folder perm
2019-03-23 12:02:19 +01:00
Tibor Vass
29de017df7
Merge pull request #38599 from thaJeztah/builder_fix_copy_permissions
builder: fix `COPY --from` should preserve ownership
2019-03-22 09:38:13 -07:00
Akihiro Suda
7c197c18d3
Merge pull request #38246 from tonistiigi/gcr-workaround
builder: add workaround for gcr auth issue
2019-03-22 15:55:55 +09:00
Tibor Vass
02ec758372
Merge pull request #38924 from tiborvass/fix-empty-warnings
ContainerCreate shouldn't return warnings=nil
2019-03-21 17:20:54 -07:00
Tibor Vass
c19b9b1885
Merge pull request #38920 from justincormack/salsa
Update golang.org/x/crypto
2019-03-21 17:19:50 -07:00