58fa4d85d1
Fix Header on migration page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0a6e0c43d9442926691cd7a842dcf55fc555c505
Component: engine
2016-02-05 00:35:49 +01:00
36dd8337c1
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
Upstream-commit: 18204ea61690797930efcf2d0a638961664ba0df
Component: engine
2016-02-04 16:31:12 -05:00
9a586d64c2
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
2016-02-04 16:20:06 -05:00
975855b6af
Change version to 1.11.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 91028ad8f4aa72945b766ca4c952b8c3d8521c9f
Component: engine
2016-02-04 15:44:35 -05:00
3b1e259c19
Bump version to v1.10.0
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 05adb0bdbbb4a4f6c1520dd625bd4e91b7744bae
Component: engine
2016-02-04 15:39:02 -05:00
a840e6953f
Merge pull request #19918 from WeiZhang555/restarting
...
Fix error for restarting container
Upstream-commit: 8038e32237e2afbb20233218efb179b61eda759a
Component: engine
2016-02-04 11:36:32 -08:00
32fac24f32
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: fe53be4e1785ab4d8cadf246e5f2de419f337adc
Component: engine
2016-02-04 13:59:57 -05:00
3f9e0313b7
Vendor engine-api, go-connections and go-winio.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d8355ead9ee301718563faa947fac8b62d11b9e9
Component: engine
2016-02-04 13:59:57 -05:00
4506ff3119
improve test-deb-install
...
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
add directory test
Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
fix indent
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
Upstream-commit: 620b8250e85abbe284eb8d34799df1bb73d82d6a
Component: engine
2016-02-04 18:14:08 +01:00
f6dfa135ec
Merge pull request #19997 from boucher/patch-2
...
Pass KEEPBUNDLE in Docker build environment.
Upstream-commit: 60821c6dfd13d170cce6308f10287cf2f0c0b072
Component: engine
2016-02-04 08:37:12 -08:00
d572e76048
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
Upstream-commit: 3329c94e256d7816ec20edb215d5c3614504e403
Component: engine
2016-02-04 08:33:07 -08:00
b5450bbcc0
Merge pull request #19998 from estesp/remove-stray-printf
...
Remove stray printf
Upstream-commit: e2bfedbc40245dcf39ab5e0cb5756784e4f508c7
Component: engine
2016-02-04 08:29:11 -08:00
49068064e4
dont try to install journald driver on wheezy
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede
Component: engine
2016-02-04 16:22:23 +01:00
25898f320a
Remove stray printf
...
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 77590d4dae9223ccd8edf9b153c669f631747f24
Component: engine
2016-02-04 10:13:31 -05:00
42f201b0c3
Pass KEEPBUNDLE in Docker build environment.
...
This is an alternate solution to the problem described in #19969 .
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: d23778168d158e0813420ffc2d10fdddba6a12b6
Component: engine
2016-02-04 09:42:41 -05:00
83fc309845
integration-cli: fix minimum and default api version test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fe6b88e3fa12810b2eaad45c613742c1eeb7290e
Component: engine
2016-02-04 13:58:08 +01:00
4aae2e5565
Fix error for restarting container
...
Fix error message for `--net container:b` and `--ipc container:b`,
container `b` is a restarting container.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 3c0a91d227a04e146d24e35d2f71d8c5343cfc77
Component: engine
2016-02-04 20:14:50 +08:00
76c413d163
Merge pull request #19949 from Microsoft/jjh/testapiresize
...
Windows CI: Port docker_api_resize_test.go
Upstream-commit: 38e774d32caf29155d27aad4fad964b082246a73
Component: engine
2016-02-04 10:11:32 +01:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
96b7f387ba
Windows CI: Port docker_api_resize_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe
Component: engine
2016-02-03 20:30:06 -08:00
e7c326da3c
Merge pull request #19702 from tiborvass/host-specific-passthru-token
...
Add test to make sure the new registry pass-thru token is only sent to the intended hosts
Upstream-commit: 66a4e557f955713adea5c97e42202fdbc0f5c06c
Component: engine
2016-02-03 21:57:32 -05:00
54169c11ac
Merge pull request #19877 from HackToday/fixdoc
...
Add support details for storage driver
Upstream-commit: a03e85b4482ab741000159f3e911c8729b387cd8
Component: engine
2016-02-04 03:07:15 +01:00
a2042aca33
Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
...
Wait to fire start event until socket is created
Upstream-commit: d47812dd1d1de206e29a644e125a0a0f28655c6c
Component: engine
2016-02-03 17:38:52 -08:00
d95ef1e6ea
Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
...
Fix error message for pause a restarting container
Upstream-commit: dcde68b955a8f75119573ec6011cb1b1a9457f60
Component: engine
2016-02-03 17:34:19 -08:00
9044b5c3c7
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
8cc70508c1
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
Upstream-commit: e74c07b947adf2d6d804068e4a647265e6e419f2
Component: engine
2016-02-03 17:32:14 -08:00
bace12bd53
Add support details for storage driver
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: feab8b179e20833dd0a65e58934cf24938da6d84
Component: engine
2016-02-04 00:51:02 +00:00
46199bee06
Merge pull request #19982 from tianon/seccomp-completion
...
Add some basic bash completion for seccomp values
Upstream-commit: ea4086ea91798d8b860d90eaf32ef216b05f4e7c
Component: engine
2016-02-03 16:15:12 -08:00
8ebdd00a4c
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 76a765140e831bdd5b7139b86db001ec6872023a
Component: engine
2016-02-03 14:44:55 -08:00
ddb874b792
Merge pull request #19858 from felixge/vboxfs-sendfile-warning
...
docs: point out known issue with nginx/vboxfs
Upstream-commit: 1ae6da75c8f0c51dc13a632d76f7769a70db36b1
Component: engine
2016-02-03 13:50:34 -08:00
a9dee671aa
Add some basic bash completion for seccomp values
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 75aa7dbe4f24cd8ac293f304f0d556c90200eea0
Component: engine
2016-02-03 13:48:34 -08:00
e930e772f5
Merge pull request #19942 from LK4D4/fix_vet_errors
...
Fix minor vet warnings
Upstream-commit: fdcce4ac0302729be91ff9de670fdb5be1c50b58
Component: engine
2016-02-03 13:31:11 -08:00
ef50eb04ca
Merge pull request #19973 from icecrime/cross_platforms_logout
...
Remove unnecessary call to `/info` endpoint
Upstream-commit: 7ecba9c6687ee922b1c77add0c92ad11858de558
Component: engine
2016-02-03 16:26:43 -05:00
05cb58c519
Merge pull request #19972 from jfrazelle/fix-opensuse
...
fix opensuse rpm
Upstream-commit: 57025bd58821a6972185fb4c0a5559289d769ef6
Component: engine
2016-02-03 13:19:51 -08:00
6e2fab11f7
Remove unnecessary call to /info
...
Avoid using the `/info` endpoint in the `login` and `logout` workflows
when the Registry endpoint is overriden by the user through the command
line.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 243d0d6bbe0376fb43a2718710f31bb068d22168
Component: engine
2016-02-03 13:10:25 -08:00
f7ee374e15
Remove case sensitive duplicate dir in vendor
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b9a395c85de3f4ea10810c8df789fc67e5b4b604
Component: engine
2016-02-03 13:06:32 -08:00
556e3002c9
Merge pull request #19975 from aaronlehmann/resolve-auth-config
...
Introduce a client-side version of resolveAuthConfig
Upstream-commit: 7e236e623b234616ca8536a0d2e3f96103aa061b
Component: engine
2016-02-03 15:57:29 -05:00
d3428a009e
Merge pull request #19971 from aaronlehmann/revert-19743
...
Revert "Set idle timeouts for HTTP reads and writes in communications with the registry"
Upstream-commit: 3fa0d09e74131f4a4dca43a1a28eb014028be62d
Component: engine
2016-02-03 15:33:29 -05:00
a223b8eb7f
Merge pull request #19976 from mbanikazemi/docs-kuryr
...
Add Kuryr Network Plugin to the docs
Upstream-commit: e17f2e7f048153b0d4f3779f9534f9dcee4b04de
Component: engine
2016-02-03 21:13:48 +01:00
d4d13b919a
Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix
...
Fix formatting in breaking changes doc
Upstream-commit: 9123a24cc8218e5222c2c4f4c9153d6971f3d128
Component: engine
2016-02-03 20:43:52 +01:00
01001e4c62
Add Kuryr Network Plugin to the docs
...
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com >
Upstream-commit: 4904210d9cd4381363a28ed40ee5cb525948c5f7
Component: engine
2016-02-03 14:21:54 -05:00
3f8eca9ec3
Merge pull request #19943 from aboch/ec
...
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
2016-02-03 11:06:35 -08:00
d9ed04ff60
Merge pull request #18680 from aaronlehmann/duplicate-pull-complete-message
...
Avoid outputting last progress item twice
Upstream-commit: bce70cdc2c4f80e75ca7435e2f3016b904b5c3f2
Component: engine
2016-02-03 11:01:45 -08:00
9ca2cca984
Introduce a client-side version of resolveAuthConfig
...
This is similar to the version in the registry package, but uses the
daemon's default index (as opposed to the default for the client's
platform) if using the "official index".
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ff17cd0bf07fb8fbd811b3a1bf472d701405b1d1
Component: engine
2016-02-03 11:01:29 -08:00
a2f4392bb3
Merge pull request #19870 from hqhq/hq_sync_Dockerfile
...
Sync with Dockerfile
Upstream-commit: ea28ca435074f2f756cfd553b172df27a8121e29
Component: engine
2016-02-03 10:57:36 -08:00
5649ae9668
Merge pull request #19959 from WeiZhang555/fix-cli-print-err
...
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
2016-02-03 10:56:19 -08:00
7eab87efde
Fix minor vet warnings
...
Also use Asserts where it's possible.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7a20a270bc7ce34c9a6f7cc9eebb38c0bb332b7f
Component: engine
2016-02-03 10:43:01 -08:00
455910471d
fix opensuse rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -08:00
b8fbe028ea
Enable cross-platforms logout from Registry
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 8ee7ad2209502f43496ff65e32fbcd7573b13c26
Component: engine
2016-02-03 10:32:22 -08:00
0abee8411c
Fix formatting in breaking changes doc
...
Signed-off-by: Florian Maier <contact@marsmenschen.com >
Upstream-commit: f0df677913ce9bc6da5253dcca62690917923a3c
Component: engine
2016-02-03 19:22:14 +01:00
