Sebastiaan van Stijn
4dc6b217d3
Merge pull request #39359 from tiborvass/fix-test-compiling
...
integration: get tests to compile again
2019-06-12 22:59:59 +02:00
Ethan Mosbaugh
50c6a5fb07
Fix rate limiting for logger, increase refill rate
...
Signed-off-by: Ethan Mosbaugh <ethan@replicated.com>
2019-06-12 13:48:36 -07:00
Tibor Vass
a281289515
integration: get tests to compile again
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-12 20:41:36 +00:00
Sebastiaan van Stijn
04ff4a2ba4
Merge pull request #39137 from arkodg/attach-to-existing-network-error
...
Handle the error case when a container reattaches to the same network
2019-06-12 19:58:04 +02:00
Sebastiaan van Stijn
39c8e88068
Merge pull request #39349 from tonistiigi/buildkit-userns-remap
...
builder-next: userns remap support
2019-06-12 16:49:19 +02:00
Jintao Zhang
6f446d041b
Bump Golang 1.12.6
...
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2019-06-12 10:16:39 +08:00
Brian Goff
349d4dd0c9
Merge pull request #39294 from AkihiroSuda/remove-it-on-swarm
...
hack: remove integration-cli-on-swarm
2019-06-11 14:24:48 -07:00
Brian Goff
02dceeaa7b
Merge pull request #39240 from olljanat/enable-new-integration-tests-for-win
...
Enable integrations API tests for Windows CI
2019-06-11 14:24:03 -07:00
Sebastiaan van Stijn
29829874d1
Merge pull request #39270 from kolyshkin/moar-aufs-fixes
...
aufs: retry umount on ebusy, ignore ENOENT in graphdriver.Mounted
2019-06-11 20:43:50 +02:00
Sebastiaan van Stijn
e511b3be89
Merge pull request #39336 from justincormack/entropy-cannot-be-saved
...
Entropy cannot be saved
2019-06-11 18:40:19 +02:00
Sebastiaan van Stijn
9e763de6ad
Merge pull request #39121 from goldwynr/master
...
apparmor: allow readby and tracedby
2019-06-11 18:25:47 +02:00
Tonis Tiigi
5c484890e0
vendor: update buildkit to c2427506
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-10 21:49:22 -07:00
Tonis Tiigi
07b3aac902
builder-next: userns remap support
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-10 21:49:17 -07:00
Olli Janatuinen
2f22247cad
Enable integrations API tests for Windows CI
...
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2019-06-10 21:32:36 +03:00
Akihiro Suda
238f8eaa31
Merge pull request #39337 from thaJeztah/bump_libnetwork
...
Re-align proxy commit with libnetwork vendor
2019-06-08 04:14:14 +09:00
Brian Goff
2b15825d9c
Merge pull request #39327 from tonistiigi/improve-non-cgo
...
allow dockerd builds without cgo
2019-06-07 10:07:44 -07:00
Sebastiaan van Stijn
35069de3fd
Re-align proxy commit with libnetwork vendor
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 15:57:23 +02:00
Yong Tang
b10cd5c0e6
Merge pull request #39332 from thaJeztah/fix_golint_again
...
Integration: change signatures to fix golint warnings
2019-06-07 06:46:58 -07:00
Sebastiaan van Stijn
28678f2226
Merge pull request #38349 from wk8/wk8/os_version
...
Adding OS version info to nodes' `Info` struct and to the system info's API
2019-06-07 14:54:51 +02:00
Sebastiaan van Stijn
66f8f2b87c
Merge pull request #39193 from olljanat/38488-layer-garbage-collector
...
Added garbage collector for image layers
2019-06-07 14:08:04 +02:00
Sebastiaan van Stijn
c85fe2d224
Merge pull request #38522 from cpuguy83/fix_timers
...
Make sure timers are stopped after use.
2019-06-07 13:16:46 +02:00
Sebastiaan van Stijn
dac5710b68
integration: change testGraphDriver signature to fix linting
...
Line 441: warning: context.Context should be the first parameter of a function (golint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 13:05:51 +02:00
Sebastiaan van Stijn
123e29f44a
integration: change createAmbiguousNetworks signature to fix linting
...
Line 30: warning: context.Context should be the first parameter of a function (golint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 13:05:43 +02:00
Sebastiaan van Stijn
9f9b4290b9
integration: change container.Run signature to fix linting
...
Line 59: warning: context.Context should be the first parameter of a function (golint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 13:05:26 +02:00
Sebastiaan van Stijn
b4c46b0dac
integration: change container.Create signature to fix linting
...
```
Line 25: warning: context.Context should be the first parameter of a function (golint)
Line 44: warning: context.Context should be the first parameter of a function (golint)
Line 52: warning: context.Context should be the first parameter of a function (golint)
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 13:04:44 +02:00
Sebastiaan van Stijn
caec45a37f
integration: change network.CreateNoError signature to fix linting
...
Line 30: warning: context.Context should be the first parameter of a function (golint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-07 13:03:24 +02:00
Justin Cormack
2df693e533
Entropy cannot be saved
...
Remove non cryptographic randomness.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2019-06-07 11:54:45 +01:00
Jean Rouge
d363a1881e
Adding OS version info to the nodes' Info
struct
...
This is needed so that we can add OS version constraints in Swarmkit, which
does require the engine to report its host's OS version (see
https://github.com/docker/swarmkit/issues/2770 ).
The OS version is parsed from the `os-release` file on Linux, and from the
`ReleaseId` string value of the `SOFTWARE\Microsoft\Windows NT\CurrentVersion`
registry key on Windows.
Added unit tests when possible, as well as Prometheus metrics.
Signed-off-by: Jean Rouge <rougej+github@gmail.com>
2019-06-06 22:40:10 +00:00
Kirill Kolyshkin
1d5748d975
Merge pull request #39173 from olljanat/25885-capabilities-swarm
...
Add support for capabilities options in services
2019-06-06 15:03:46 -07:00
Brian Goff
cf406eb359
Merge pull request #39307 from kolyshkin/aufs-reinstate-mntL
...
Revert "aufs: remove mntL"
2019-06-06 11:22:16 -07:00
Brian Goff
4961f30d88
Merge pull request #39325 from thaJeztah/harden_TestPsListContainersFilterExited
...
Harden TestPsListContainersFilterExited
2019-06-06 11:21:34 -07:00
Tonis Tiigi
cf104d85c3
stats: avoid cgo in collector
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-05 22:21:11 -07:00
Tonis Tiigi
230a55d337
copy: allow non-cgo build
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-05 22:21:11 -07:00
Tonis Tiigi
186cd7cf4a
quota: add noncgo build tag
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-05 22:21:06 -07:00
Akihiro Suda
e0fefb9a7f
Merge pull request #39309 from thaJeztah/fix_api_history2
...
Move cgroup info changes to API v1.40
2019-06-06 13:39:35 +09:00
Tõnis Tiigi
db18c6f133
Merge pull request #39318 from thaJeztah/fix_typo
...
Fix typo retreive -> retrieve
2019-06-05 16:31:11 -07:00
Olli Janatuinen
213681b66a
First step to implement full garbage collector for image layers
...
Refactored exiting logic on way that layers are first marked to be under
removal so if actual removal fails they can be found from disk and
cleaned up.
Full garbage collector will be implemented as part of containerd
migration.
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2019-06-05 22:02:42 +03:00
Sebastiaan van Stijn
915acffdb4
Harden TestPsListContainersFilterExited
...
This test runs on a daemon also used by other tests
so make sure we don't get failures if another test
doesn't cleanup or is running in parallel.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-05 17:02:44 +02:00
Sebastiaan van Stijn
71e00574c7
Merge pull request #39279 from ZYecho/fix-swagger-copy
...
fix: fix lack of copyUIDGID in swagger.yaml
2019-06-05 13:13:59 +02:00
Sebastiaan van Stijn
55ad894d63
Merge pull request #39320 from microsoft/jjh/39290alternate
...
Windows: Don't attempt detach VHD for R/O layers
2019-06-05 12:25:40 +02:00
zhangyue
a4f828cb89
fix: fix lack of copyUIDGID in swagger.yaml
...
Signed-off-by: Zhang Yue <zy675793960@yeah.net>
Signed-off-by: zhangyue <zy675793960@yeah.net>
2019-06-05 09:58:04 +08:00
John Howard
293c74ba79
Windows: Don't attempt detach VHD for R/O layers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-06-04 13:38:52 -07:00
Sebastiaan van Stijn
a6e1502575
Merge pull request #39295 from tiborvass/buildkit-systemd-resolvconf
...
build: buildkit now also uses systemd's resolv.conf
2019-06-04 20:28:36 +02:00
Sebastiaan van Stijn
bd89b3f553
Merge pull request #39288 from dohse/do-not-order-uid-gid-mappings
...
Stop sorting uid and gid ranges in id maps
2019-06-04 20:12:30 +02:00
Sebastiaan van Stijn
a74eb9c36b
Merge pull request #39308 from thaJeztah/fix_clone_seccomp_cgroupns
...
Fix seccomp profile for clone syscall
2019-06-04 20:11:15 +02:00
Tibor Vass
54043d2f6f
Merge pull request #39281 from dperny/vendor-swarmkit
...
Revert docker/swarmkit#2804
2019-06-04 10:28:42 -07:00
Tibor Vass
18a4498c2d
Merge pull request #39306 from dperny/increase-swarmkit-grpc
...
Increase max recv gRPC message size for nodes and secrets
2019-06-04 09:32:24 -07:00
Akihiro Suda
364f9bce16
Merge pull request #39292 from cpuguy83/root_dir_on_copy
...
Pass root to chroot to for chroot Tar/Untar (CVE-2018-15664)
2019-06-05 01:05:29 +09:00
Tibor Vass
8ff4ec98cf
build: buildkit now also uses systemd's resolv.conf
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-04 16:04:10 +00:00
Tibor Vass
2e58093662
Merge pull request #39315 from tonistiigi/update-buildkit
...
vendor: update buildkit to 37d53758
2019-06-04 08:59:12 -07:00