5502018bf5
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 985fe8857d6670e5a484237a8c8ccdde66a39013
Component: engine
2015-10-29 17:04:38 -07:00
f8757c11b0
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
27424c56e7
Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
...
Fix rmi -f removing multiple tags
Upstream-commit: cdfd9846f480b54dc6207b578c29ecfe2cdeed34
Component: engine
2015-10-29 13:01:06 -07:00
a94cd37485
Execute buildPortMapInfo after Endpoint.Join()
...
- As the retrieved info may not be available at
Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e03daebb48221bae84bfc48b0f9b652ced6d93f3
Component: engine
2015-10-29 11:47:30 -07:00
09de1db703
Merge pull request #17488 from jfrazelle/skip-windows-test
...
cant run volume on windows w remote daemon host
Upstream-commit: 8d62f243c725c6eba43ca59ef17407e43004a238
Component: engine
2015-10-29 13:37:39 -04:00
4a8db513f4
Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
7fc5a670bb
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1a6a860c143487b96b8a6221768a73ed4cef6d7b
Component: engine
2015-10-29 08:55:48 -07:00
d488544828
Merge pull request #17471 from jfrazelle/fix-userns
...
fix experimental tests
Upstream-commit: 8e144e6c5090572176af3dec07424cefba1cbcc1
Component: engine
2015-10-29 00:10:08 -07:00
58647231c1
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 44da86172aeb750d0ac46c000e32e51a12411ecd
Component: engine
2015-10-28 21:14:45 -07:00
b2d6b2b0d2
Merge pull request #17462 from LK4D4/fix_device_tool
...
Fix docker-device-tool
Upstream-commit: 965706245b702c08d23ce7da2e91440ccec74726
Component: engine
2015-10-28 18:56:54 -07:00
b0c9467783
Merge pull request #17437 from LK4D4/put_error
...
Do not ignore error from driver.Put
Upstream-commit: 0e1618db194388e7fe54332a7e192eb41ad9df89
Component: engine
2015-10-28 17:32:03 -07:00
7a5788a9d4
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 584bdaf5d92d1f8beda602493c90c389d6b82b47
Component: engine
2015-10-28 16:43:53 -07:00
26f967025f
Merge pull request #17458 from LK4D4/unnec_err
...
Remove unnecessary error returns
Upstream-commit: 7de2b49ac86cf92fd2af34f671503118c3cc8b16
Component: engine
2015-10-28 16:25:40 -07:00
4cf9c8be78
Fix rmi -f removing multiple tags
...
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 48e7f7963e142a0a45b583c5e65015d896c59433
Component: engine
2015-10-28 16:07:02 -07:00
0317f9b3fb
Merge pull request #16898 from hqhq/hq_bump_bolt
...
Bump bolt to v1.1.0
Upstream-commit: b6e1f4dd69a865df847dd4f6efe12df21f5c34dd
Component: engine
2015-10-28 18:51:23 -04:00
a0d60ea3e8
Remove unnecessary error returns
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 990655448dec63ef8add376becb1a20ae184a162
Component: engine
2015-10-28 15:15:22 -07:00
b5b91966d7
Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
...
Fix docker inspect display odd gateway value for none network mode
Upstream-commit: 54d42f4a107641c2755ea1d6e55ca41d8945f4f8
Component: engine
2015-10-28 13:39:59 -07:00
17a203e45b
Merge pull request #17445 from tiborvass/fix-docker-py
...
docker-py: upgrade and fix test script
Upstream-commit: 2fb442f145813d5b66bdea558c422ced8d1fe8c2
Component: engine
2015-10-28 11:16:41 -07:00
b78e8b7756
docker-py: upgrade and fix test script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
552e02ae16
Do not ignore error from driver.Put
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bc09eceaf401893275b6ec5508d523ec39357d78
Component: engine
2015-10-28 06:54:09 -07:00
72e420120c
Merge pull request #17418 from diogomonica/bump-go-1.5
...
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
2015-10-27 20:12:43 -07:00
62616f762f
Fix docker inspect display odd gateway value for none network mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
2015-10-27 21:47:12 -04:00
238006044d
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00
cc55863497
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.
Commit caused issues on systems with case-insensitive filesystems.
Revert for now
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
ff53341015
Bump bolt to v1.1.0
...
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
50ef9e9aba
Merge pull request #17422 from calavera/inspect_networks_docs
...
Update inspect api examples with new network settings.
Upstream-commit: 94811ae814ddce67b623d35ef44dcf276629442f
Component: engine
2015-10-27 20:09:54 -04:00
fbb5f4e19f
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
28eb09ab06
Update inspect api examples with new network settings.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
2015-10-27 19:56:29 -04:00
1cfc0cf7f6
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
Upstream-commit: 2266462f724492d3802d7043723347adeb18024e
Component: engine
2015-10-27 19:52:11 -04:00
6c30abdc61
Extract network settings types for inspect.
...
Keeping backwards compatibility.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
3babd01129
Merge pull request #16017 from flowlo/master
...
docs: Explain volume_name in POST /container Binds
Upstream-commit: b96e076af9478f37c5efd3f56e5f0aa42c846b66
Component: engine
2015-10-27 23:28:47 +01:00
d0602d1990
Merge pull request #17401 from hugomarisco/patch-1
...
update gpg add key command, without sudo it fails
Upstream-commit: 1156b7ff66c749814535008e66149a6027dc9a36
Component: engine
2015-10-27 15:16:27 -07:00
99471f9ab2
update to binaries, fix parsers package, non-parallel test unit
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -07:00
a3a7b41a5a
Merge pull request #17382 from jecarey/16765-docker_cli_images_test
...
Use of checkers on docker_cli_images_test.go
Upstream-commit: 1c8ee617d164fec5da15d274516dc5131bcd41dd
Component: engine
2015-10-27 17:25:45 -04:00
9cd08e6796
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
95c227e717
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
2015-10-27 13:29:18 -07:00
af90e68a88
Merge pull request #17405 from LK4D4/cont_pointer
...
Return pointer from newBaseContainer
Upstream-commit: 82f70677b99e7d30c63d40658b36b0c5373cadba
Component: engine
2015-10-27 13:27:10 -07:00
46ab4a1920
Use of checkers on docker_cli_images_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com >
Upstream-commit: 5814d67f9850e5eff9d6beb24b2b9dde89ee7381
Component: engine
2015-10-27 15:26:38 -05:00
c2f87fdd0e
Fix docker inspect container only reports last assigned information
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4
Component: engine
2015-10-27 16:26:06 -04:00
64556fe044
Merge pull request #17406 from LK4D4/ent_and_args_simple
...
Simplify getEntrypointAndArgs
Upstream-commit: 2b1b7823e61d9d14064708d37a56275ee7385bd2
Component: engine
2015-10-27 13:24:59 -07:00
17762bddf9
Merge pull request #17161 from moxiegirl/commands-network
...
Updating network commands: adding man pages
Upstream-commit: bf9f2691ca6bf19d81b43c2faa37fbad89b68672
Component: engine
2015-10-27 13:22:30 -07:00
edfe664f0f
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
Upstream-commit: 64854277f87d5f5d1f79db340ecb0b82d82f1865
Component: engine
2015-10-27 13:21:15 -07:00
c7cd2c91a7
Merge pull request #17230 from aboch/ae
...
Do not update etc/hosts file for every container
Upstream-commit: 194b64951a19ef6254422891cc9ff191ed2567cd
Component: engine
2015-10-27 16:14:44 -04:00
4d261096ec
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
b99deef664
Merge pull request #17408 from jfrazelle/dnf-fedora-builds
...
update dockerfile to use dnf because i hate the warning
Upstream-commit: eec5e675615816138564b82a7b2ebbda69b67749
Component: engine
2015-10-27 11:04:08 -07:00
8ad5b6fcfd
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
2015-10-27 11:03:22 -07:00
e7265101a5
Dockerfile: bump Go to 1.5
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 42dcc4f3b5e0ddd2042a75c5d3f3c610d7e839c1
Component: engine
2015-10-27 10:56:49 -07:00
e752bdf012
update dockerfile to use dnf because i hate the warning
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b8891a32d13724bb992d9e8aca4777a32334371e
Component: engine
2015-10-27 10:25:39 -07:00
33a72eeb51
Simplify getEntrypointAndArgs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5f6d27cebaec3d2e9e72579c91591aea5bcb6966
Component: engine
2015-10-27 09:36:11 -07:00
b9824763f3
Return pointer from newBaseContainer
...
It makes code more consistent.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6d9bb99c97438edc996e51e13a0aca0feabc5d26
Component: engine
2015-10-27 09:05:28 -07:00
