Commit graph

19381 commits

Author SHA1 Message Date
Jessica Frazelle
985fe8857d
update go version for debs and rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 17:04:38 -07:00
Alexander Morozov
7f7950aa18 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
David Calavera
cdfd9846f4 Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
Fix rmi -f removing multiple tags
2015-10-29 13:01:06 -07:00
Alessandro Boch
e03daebb48 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>
2015-10-29 11:47:30 -07:00
Brian Goff
8d62f243c7 Merge pull request #17488 from jfrazelle/skip-windows-test
cant run volume on windows w remote daemon host
2015-10-29 13:37:39 -04:00
Alessandro Boch
90744fe943 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-29 09:24:48 -07:00
Jessica Frazelle
1a6a860c14
cant run volume on windows
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 08:55:48 -07:00
Jess Frazelle
8e144e6c50 Merge pull request #17471 from jfrazelle/fix-userns
fix experimental tests
2015-10-29 00:10:08 -07:00
Jessica Frazelle
44da86172a
fix experimental tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-28 21:14:45 -07:00
Jess Frazelle
965706245b Merge pull request #17462 from LK4D4/fix_device_tool
Fix docker-device-tool
2015-10-28 18:56:54 -07:00
David Calavera
0e1618db19 Merge pull request #17437 from LK4D4/put_error
Do not ignore error from driver.Put
2015-10-28 17:32:03 -07:00
Alexander Morozov
584bdaf5d9 Fix docker-device-tool
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 16:43:53 -07:00
David Calavera
7de2b49ac8 Merge pull request #17458 from LK4D4/unnec_err
Remove unnecessary error returns
2015-10-28 16:25:40 -07:00
Derek McGowan
48e7f7963e 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)
2015-10-28 16:07:02 -07:00
Doug Davis
b6e1f4dd69 Merge pull request #16898 from hqhq/hq_bump_bolt
Bump bolt to v1.1.0
2015-10-28 18:51:23 -04:00
Alexander Morozov
990655448d Remove unnecessary error returns
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 15:15:22 -07:00
David Calavera
54d42f4a10 Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
Fix docker inspect display odd gateway value for none network mode
2015-10-28 13:39:59 -07:00
David Calavera
2fb442f145 Merge pull request #17445 from tiborvass/fix-docker-py
docker-py: upgrade and fix test script
2015-10-28 11:16:41 -07:00
Tibor Vass
8db141049f docker-py: upgrade and fix test script
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-28 12:56:50 -04:00
Alexander Morozov
bc09eceaf4 Do not ignore error from driver.Put
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 06:54:09 -07:00
Jess Frazelle
96a6e810de Merge pull request #17418 from diogomonica/bump-go-1.5
Bump go 1.5
2015-10-27 20:12:43 -07:00
Lei Jitang
7fa601adc7 Fix docker inspect display odd gateway value for none network mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 21:47:12 -04:00
Jess Frazelle
b227d19cae Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
Brian Goff
b78ca243d9 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-27 21:23:53 -04:00
Qiang Huang
a41917c2c8 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>
2015-10-28 08:49:45 +08:00
Tibor Vass
94811ae814 Merge pull request #17422 from calavera/inspect_networks_docs
Update inspect api examples with new network settings.
2015-10-27 20:09:54 -04:00
David Calavera
9ab71b68af Merge pull request #17393 from tiborvass/carry-17360
Carry Fix docker inspect container only reports last assigned information
2015-10-27 17:00:41 -07:00
David Calavera
9a7e632cf0 Update inspect api examples with new network settings.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-27 19:56:29 -04:00
Brian Goff
2266462f72 Merge pull request #17373 from Microsoft/10662-volumetests
Windows: Volume integration tests
2015-10-27 19:52:11 -04:00
David Calavera
25682577c9 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>
2015-10-27 19:16:21 -04:00
Sebastiaan van Stijn
b96e076af9 Merge pull request #16017 from flowlo/master
docs: Explain volume_name in POST /container Binds
2015-10-27 23:28:47 +01:00
David Calavera
1156b7ff66 Merge pull request #17401 from hugomarisco/patch-1
update gpg add key command, without sudo it fails
2015-10-27 15:16:27 -07:00
Jessica Frazelle
9bcbb39fa8
update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-27 14:43:25 -07:00
Brian Goff
1c8ee617d1 Merge pull request #17382 from jecarey/16765-docker_cli_images_test
Use of checkers on docker_cli_images_test.go
2015-10-27 17:25:45 -04:00
David Calavera
6276c676a8 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
Alexandre Beslic
85ae8b034a Merge pull request #17364 from mavenugo/advertise
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
David Calavera
82f70677b9 Merge pull request #17405 from LK4D4/cont_pointer
Return pointer from newBaseContainer
2015-10-27 13:27:10 -07:00
James Carey
5814d67f98 Use of checkers on docker_cli_images_test.go
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-27 15:26:38 -05:00
Lei Jitang
1b9a08e719 Fix docker inspect container only reports last assigned information
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 16:26:06 -04:00
David Calavera
2b1b7823e6 Merge pull request #17406 from LK4D4/ent_and_args_simple
Simplify getEntrypointAndArgs
2015-10-27 13:24:59 -07:00
moxiegirl
bf9f2691ca Merge pull request #17161 from moxiegirl/commands-network
Updating network commands: adding man pages
2015-10-27 13:22:30 -07:00
David Calavera
64854277f8 Merge pull request #17390 from sanimej/libn
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
Tibor Vass
194b64951a Merge pull request #17230 from aboch/ae
Do not update etc/hosts file for every container
2015-10-27 16:14:44 -04:00
Vincent Demeester
d5cd032a86 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>
2015-10-27 20:36:07 +01:00
David Calavera
eec5e67561 Merge pull request #17408 from jfrazelle/dnf-fedora-builds
update dockerfile to use dnf because i hate the warning
2015-10-27 11:04:08 -07:00
Madhu Venugopal
3e7db73b99 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>
2015-10-27 11:03:22 -07:00
unclejack
42dcc4f3b5
Dockerfile: bump Go to 1.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-10-27 10:56:49 -07:00
Jessica Frazelle
b8891a32d1
update dockerfile to use dnf because i hate the warning
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-27 10:25:39 -07:00
Alexander Morozov
5f6d27ceba Simplify getEntrypointAndArgs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:36:11 -07:00
Alexander Morozov
6d9bb99c97 Return pointer from newBaseContainer
It makes code more consistent.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:05:28 -07:00