James Turnbull
af8a444481
Merge pull request #18454 from dcylabs/master
...
added albatros library
Upstream-commit: 6b8d8bfbf8f3125187f677d55cad7587dd070b27
Component: engine
2015-12-06 15:01:55 -06:00
dcylabs
4769eb1560
added albatros library
...
Signed-off-by: dcylabs <dcylabs@gmail.com >
Upstream-commit: a94bede2aa04bbb4f05fcda70f8edfa7917a3238
Component: engine
2015-12-06 20:40:42 +01:00
Sebastiaan van Stijn
26496961f2
Merge pull request #17741 from dhiltgen/pull_token
...
Add token pass-thru for AuthConfig
Upstream-commit: 715f6a135c6787fdb6834a6d167b3adc06943afe
Component: engine
2015-12-06 16:40:06 +01:00
Vincent Demeester
b461d8e9fc
Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api
...
Remove CLI specific information for API error messages. Issue #17147
Upstream-commit: 32f08e06e635adac43cd7113e8118394eeafc0b6
Component: engine
2015-12-06 16:02:40 +01:00
Sebastiaan van Stijn
d6d57d5554
Merge pull request #17788 from haoshuwei/modify-volume-inspect-multi
...
Modify docker volume inspect to return existed volumes and the names of the unexsited volumes
Upstream-commit: 5b4734aaa543243ba076bf606286bbc46fed9e38
Component: engine
2015-12-06 14:03:46 +01:00
Jess Frazelle
c0c8958c4e
Merge pull request #18446 from LK4D4/vendor_pkg_dockerignore
...
Add vendor/pkg to .dockerignore
Upstream-commit: b98577af83100ac91e94deba50093f9e0aedad93
Component: engine
2015-12-05 10:06:52 -08:00
Jess Frazelle
ab6c9709f6
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
Doug Davis
8cfbba86b8
Merge pull request #18450 from runcom/typo-ocd
...
integration-cli: fix test name typo
Upstream-commit: 540c60797283545489193b533c1da93b738ee1bd
Component: engine
2015-12-05 09:15:51 -05:00
Antonio Murdaca
8c68850665
integration-cli: fix test name typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 09c4643ce1e9c0ae29e0489daefe0053aeed260f
Component: engine
2015-12-05 11:42:46 +01:00
Alexander Morozov
de4815997a
Add vendor/pkg to .dockerignore
...
It's in .gitignore too, so why not
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9c8d6edbf15a33045cffb37b6406715dc8776675
Component: engine
2015-12-04 17:03:24 -08:00
David Calavera
43099d9c25
Merge pull request #18418 from aaronlehmann/no-head-requests
...
Avoid a HEAD request for each layer in a v2 pull
Upstream-commit: 82c47088db8a0b460df81e5c2c7a099989ba48b8
Component: engine
2015-12-04 14:51:54 -08:00
David Calavera
a271500de6
Merge pull request #18443 from tonistiigi/fix-images-delete
...
Fix image deletion conflicts with search
Upstream-commit: a4817b8b2143556c7b656c314fbcda6d5603bf2f
Component: engine
2015-12-04 14:49:18 -08:00
Tonis Tiigi
aedf5127c5
Fix image deletion conflicts with search
...
Removed images were not cleaned up from the
digest-set that is used for the search index.
Fixes #18437
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fcb083c6ac0fdb71e8db7a58f07a561342d631d3
Component: engine
2015-12-04 13:15:54 -08:00
Alexander Morozov
339236ffdf
Merge pull request #18408 from tonistiigi/disable-systemd-timeout
...
Disable timeout for systemd
Upstream-commit: 23f00624a174dce985615ba4438303039b16dd09
Component: engine
2015-12-04 12:34:19 -08:00
Jess Frazelle
fee5b92987
Merge pull request #18436 from estesp/fix-initlayer-perms
...
Fix init layer chown of existing dir ownership
Upstream-commit: a56f258c8af4524f00750fbaa92d7b1f85981cef
Component: engine
2015-12-04 11:53:09 -08:00
Phil Estes
d7dafeedd3
Merge pull request #18398 from calavera/system_backend
...
Move docker system information to a dedicated router and backend.
Upstream-commit: 51b0f23127f115ce24b45dac2d565db58d25458e
Component: engine
2015-12-04 12:56:57 -05:00
Aaron Lehmann
3e1a2d1f77
Avoid a HEAD request for each layer in a v2 pull
...
We were calling Stat for each layer to get the size so we could indicate
progress, but https://github.com/docker/distribution/pull/1226 made it
possible to get the length from the GET request that Open initiates.
Saving one round-trip per layer should make pull operations slightly
faster and more robust.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39589800b4750bf28078efe57f7f1e74d971248f
Component: engine
2015-12-04 09:32:16 -08:00
Jess Frazelle
355bde6b1b
Merge pull request #18404 from jfrazelle/cleanup-maintainers
...
cleanup people in maintainers file
Upstream-commit: e29f208547220c3c31abb2f8fd36d9e1ea70ec05
Component: engine
2015-12-04 09:25:43 -08:00
Phil Estes
37ebaba7a1
Fix init layer chown of existing dir ownership
...
This solves a bug where /etc may have pre-existing permissions from
build time, but init layer setup (reworked for user namespaces) was
assuming root ownership. Adds a test as well to catch this situation in
the future.
Minor fix to wrong ordering of chown/close on files created during the
same initlayer setup.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 23b771782ab7236ce5024ac5773a6ded9a2af753
Component: engine
2015-12-04 12:18:05 -05:00
Sebastiaan van Stijn
cb5428fd49
Merge pull request #18434 from haugene/master
...
docs: fix typo in bash_history mount example
Upstream-commit: 5a9bf3a3d38043b88ae137ff388001a690cc94f0
Component: engine
2015-12-04 16:15:36 +01:00
Kristian Haugene
d0e41cba7f
docs: fix typo in bash_history mount example
...
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com >
Upstream-commit: 655766ed955477299fac95a0fcd60af58f2b5be8
Component: engine
2015-12-04 16:09:25 +01:00
Sebastiaan van Stijn
13df21d3ec
Merge pull request #18325 from RsrchBoy/topic/newtorks
...
newtork -> network (minor spelling correction)
Upstream-commit: e3fbd6922fe549755890a205a0b8dd88022d5924
Component: engine
2015-12-04 14:03:55 +01:00
Sebastiaan van Stijn
9e539c7be0
Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
...
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
Sebastiaan van Stijn
99997548a7
Merge pull request #18384 from Mashimiao/weight-device-docs-fix
...
docs: fix blkio-weight-device option args
Upstream-commit: 605c56295fffdf3658d0f6c8faa1b0de03e50e37
Component: engine
2015-12-04 12:04:23 +01:00
Alexander Morozov
6790de2194
Merge pull request #18412 from aaronlehmann/runcommand-race
...
Fix race in RunCommandWithOutputForDuration
Upstream-commit: 7c1c96551d41e369a588e365a9bb99acb5bc8fdb
Component: engine
2015-12-03 19:35:04 -08:00
Jess Frazelle
07663b4b7e
Merge pull request #18413 from jfrazelle/update-go-version
...
update go version
Upstream-commit: a65502f7513b6695d18a68785080192454ef9236
Component: engine
2015-12-03 18:18:47 -08:00
Doug Davis
448be2245f
Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
...
Vendor distribution and fix inspect by sha256 prefix
Upstream-commit: c80d03db77d1bb70f85b3d765221bf7206714344
Component: engine
2015-12-03 20:59:47 -05:00
Ma Shimiao
d5560ff674
docs: fix weight-deivce option args
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
Ma Shimiao
7be0f9667b
Add support for blkio read/write bps device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
Jessica Frazelle
1c9031a8a0
update go version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b7b707af2e617d62343391c6c82b984ff41b08e2
Component: engine
2015-12-03 16:37:13 -08:00
Alexander Morozov
9dd07d2075
Merge pull request #18411 from aaronlehmann/unit-test-timing
...
Adjust TestDockerCmdWithTimeout timeout to improve reliability
Upstream-commit: 4e6bea596472a02509bb966d077a93fe9490f6e1
Component: engine
2015-12-03 16:34:36 -08:00
Aaron Lehmann
9a19c84124
Fix race in RunCommandWithOutputForDuration
...
This function was starting a goroutine that modifies one of its return
values. The intent is for the goroutine to only influence the return
value when it's causing the function to return, but it's racy and can
also modify the return value when the function is returning due to the
timeout. Fix the goroutine to not modify return values directly.
Also, give the channel a buffer so that the goroutine doesn't block
forever after a timeout.
Fixes #18305
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2704fd9156bfb0fb8dc16c42902bb18ea5aa94a9
Component: engine
2015-12-03 16:34:01 -08:00
Jessica Frazelle
fa7d79e4ed
add docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 831af89991edd442ef4eeb29fd01da576b04bcfc
Component: engine
2015-12-03 16:30:52 -08:00
Jessica Frazelle
6ac4c29a4e
hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ec6d3392f1efc49d0609370e70a749a00555508c
Component: engine
2015-12-03 16:30:51 -08:00
Jessica Frazelle
bfb7e82f4d
update packagers.md and kernel config check
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: cde9e8bc83182f0d100c4eda6acb5d4cbc995aac
Component: engine
2015-12-03 16:30:50 -08:00
Jessica Frazelle
a19fea4fba
update bash completion for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ae76f7e23e0b9d7aceb711077a7ffc1f0e57de9c
Component: engine
2015-12-03 16:30:49 -08:00
Jessica Frazelle
58deeedf40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00
Jessica Frazelle
4f88ba8722
inital seccomp support
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6707f4b9b638b367a1dde6f8684a5b9817a882f0
Component: engine
2015-12-03 16:30:44 -08:00
Jessica Frazelle
174151a454
update debs/rpms for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 255004ef335d5e6cc4ec0f51ecff676e9d84643b
Component: engine
2015-12-03 16:20:05 -08:00
Jessica Frazelle
bb9f4fa0e8
dockerfile update for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d616a097638bc73a652bcf5f7b25465c25bfaa83
Component: engine
2015-12-03 16:20:03 -08:00
Aaron Lehmann
4ee82987ec
Adjust TestDockerCmdWithTimeout timeout to improve reliability
...
I saw a failure of TestDockerCmdWithTimeout. This test starts a command
that produces output after 10 ms, but uses a 5 ms timeout, so normally
the command will be killed before the output. The time intervals are so
small that the timeout may not reliably trigger before the output, which
can cause the test to fail.
This commit changes the test to only fail if the process is still alive
after 10 seconds. This means the test will confirm that the timeouts are
happening, but not attempt to gauge that the timeouts are happening
within milliseconds of when they are expected (which can't be done
reliably).
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 13d768b8ee05d3158c62d761e4ebe657cd7a8c25
Component: engine
2015-12-03 14:42:32 -08:00
Michael Crosby
287778e637
Merge pull request #18402 from Microsoft/jjh/timeout
...
Windows CI Fix: Timeout change
Upstream-commit: 2856a3048238d7a746d57028e48ea2489555e6e5
Component: engine
2015-12-03 14:33:09 -08:00
Michael Crosby
5fc75a60ac
Merge pull request #18347 from tiborvass/container_package
...
Move Container to its own package (carry of 17969)
Upstream-commit: 168b490062aed36bf95426d9d66dcf5703842016
Component: engine
2015-12-03 14:10:16 -08:00
Tonis Tiigi
1c47f9b984
Add test for inspect with a sha256 prefix
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 61d6240069cda31559523b98cecb6b340a9d45fd
Component: engine
2015-12-03 14:06:30 -08:00
Tonis Tiigi
d286ab94c3
vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2
Component: engine
2015-12-03 13:36:31 -08:00
David Calavera
0b8eb4aacf
Merge pull request #18374 from calavera/volume_inspect_exit
...
Return error code when `volume inspect` fails with a template.
Upstream-commit: 29c69ce2a9158899257aa3e015b4db098f662bdd
Component: engine
2015-12-03 13:31:47 -08:00
Phil Estes
9f99937185
Merge pull request #17481 from vdemeester/17446-network-inspect-format
...
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
Tonis Tiigi
bceb4f3dff
Disable timeout for systemd
...
With content addressability update starting upgraded
daemon for the first time can take a long time if
graph dir was not prepared with a migration tool before.
This avoids systemd timeouts while the migration is
taking place.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: eff5e6498fa424587c339b5ae54e28f003775e4b
Component: engine
2015-12-03 13:15:31 -08:00
John Howard
ec460c332e
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2097e7fceec5c58352f78e8667000c8b5cb85231
Component: engine
2015-12-03 12:45:56 -08:00
Jess Frazelle
55ae612250
Merge pull request #18397 from Microsoft/jjh/fix-windows-ci
...
Fix broken Windows CI
Upstream-commit: 94d5459a0ca3b40d0ae34747a862d06bf20fd221
Component: engine
2015-12-03 12:41:19 -08:00
