centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 14:58:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
19,555 Commits 54 Branches 28 Tags
9f79cfdb2f1f6aeb64c84e7cb877fc38d052d187
Commit Graph

689 Commits

Author SHA1 Message Date
Shuwei Hao
11062ea177 Fixing wrong word spelling in api/client/network.go 
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
 2015-11-04 13:42:34 +00:00
Hu Keping
5a3236d9e8 Update logic of history 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-11-02 10:27:54 +08:00
Arnaud Porterie
5719d01066 Merge pull request #16579 from coolljt0725/fix_attach_paused_container 
Add show error when attach to a paused container
 2015-10-31 07:43:22 -07:00
John Howard
d5c85897f4 Windows: Allows --isolation on docker build 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 11:14:38 -07:00
Sebastiaan van Stijn
855487b379 Merge pull request #17365 from HuKeping/rework-history 
Rework docker cli history
 2015-10-30 10:33:16 +01:00
David Calavera
34668ad68b Let the api to choose the default network driver. 
That way swarm can understand the user's intention.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-29 19:47:12 -04:00
Hu Keping
09eedc35b2 Rework docker cli history 
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.

There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.

Since `quiet` will only display the container IDs so it could be not
nested with the other options.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-29 17:59:07 +08:00
Lei Jitang
de1d611990 Add show error when attach to a paused container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-28 21:00:09 -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
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
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
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
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
John Howard
2af5034ce8 Windows: Volume integration tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-26 14:33:28 -07:00
moxiegirl
c10ef20ed8 Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax 
Update docker network inspect help syntax
 2015-10-24 21:56:38 -07:00
Sebastiaan van Stijn
448398c2a8 Merge pull request #15780 from mountkin/build-multi-tags 
Add ability to add multiple tags with docker build
 2015-10-23 13:50:35 -07:00
Vincent Demeester
3dd50eaf05 Update docker network inspect help syntax 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-23 22:48:22 +02:00
Shijiang Wei
c2eb37f9ae Add ability to add multiple tags with docker build 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-10-24 00:59:56 +08:00
David Calavera
3b9c13873a Fail when there is an error executing an inspect template. 
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-22 19:24:50 -04:00
Tonis Tiigi
dfdee41308 Show trust variable deprecation warning only if used 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-10-22 11:01:30 -07:00
Sebastiaan van Stijn
9f031f70ce Merge pull request #17218 from vdemeester/17023-network-multiple-inspect 
Add support for multiple network in inspect
 2015-10-21 11:09:02 -07:00
Tibor Vass
6a7c38a57d Merge pull request #16940 from coolljt0725/default_tls_host 
Make default tls host work
 2015-10-21 14:02:22 -04:00
Sebastiaan van Stijn
492945235b Merge pull request #17136 from gesellix/change-route-volume-create 
rename `POST /volumes` to `POST /volumes/create`
 2015-10-21 10:21:27 -07:00
Vincent Demeester
7af9f988ac Add support for multiple network in inspect 
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.

`docker network inspect host bridge none` is possible now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-21 08:57:29 +02:00
Antonio Murdaca
bb085b7661 Merge pull request #17125 from calavera/check_exec_start_json 
Check the content type is json when calling exec start.
 2015-10-19 18:44:42 +02:00
David Calavera
45dc57f229 Check the content type is json when calling exec start. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-19 11:46:44 -04:00
Lei Jitang
fbb01b8162 Make default tls host work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-19 21:17:37 +08:00
Tobias Gesellchen
0c95eeb584 rename POST /volumes to POST /volumes/create to be consistent with the other POST /.../create endpoints 
see #17132

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-10-17 14:13:40 +02:00
Antonio Murdaca
ab1f03397e Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts 
Deprecate -c cli short variant flag in docker cli build & create
 2015-10-17 10:22:46 +02:00
Vincent Demeester
d1064bd441 Deprecate -c cli short variant flag in docker cli 
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-17 00:05:34 +02:00
Madhu Venugopal
6f3eb994b5 Pass network driver option in docker network command 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-16 14:33:54 -07:00
Victor Vieux
17b0017cd0 use Server Version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-14 17:46:59 -07:00
Victor Vieux
ddf04ad113 only display 'Engine Version' when it's not empty 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-14 06:45:11 -07:00
Alexandre Beslic
4ea3ff7061 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
 2015-10-13 14:41:19 -07:00
Vincent Demeester
ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
 2015-10-13 23:16:10 +02:00
Madhu Venugopal
cc6aece1fd IPAM API & UX 
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 11:03:03 -07:00
Doug Davis
ba973f2d74 Remove used param on ParseHost 
The first param on opts.ParseHost() wasn't being used for anything.

Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-10-11 20:45:17 -07:00
Sebastiaan van Stijn
c45ad0b02d Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376 
Default the tcp port to 2376 if tls is on, and 2375 if not
 2015-10-11 15:35:04 -07:00
Zhang Kun
b4d6b23838 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-10-10 20:44:29 +08:00
Sven Dowideit
50f0906007 Default the tcp port to 2376 if tls is on, and 2375 if not 
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-09 17:48:03 -07:00
Diogo Monica
d9a2fadb5e Changing docs to reflect new names 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-09 15:13:37 -07:00
Diogo Monica
52240c2d62 Changed trust ENV variables while still supporting old ones 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-09 12:19:43 -07:00
Jess Frazelle
a1d432301d Merge pull request #16859 from diogomonica/changing-trust-server-checks 
Changing trustServer allowed URL validation
 2015-10-08 18:33:35 -07:00
Diogo Monica
a2f9fb7777 Changing trustServer allowed URL behavior 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-08 17:47:25 -07:00
Jess Frazelle
4796b5c2f8 Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded 
client/start: fix logic for discarded signal
 2015-10-08 12:54:31 -07:00
Jess Frazelle
cc411c054f Merge pull request #16785 from cpuguy83/exec_cleanup 
Cleanup some issues with exec
 2015-10-08 12:02:03 -07:00
Jess Frazelle
b5d914188e Merge pull request #16674 from coolljt0725/use_consistent_command_description 
Use consistent command description
 2015-10-08 12:01:16 -07:00
Jess Frazelle
9123f77a78 Merge pull request #16817 from cpuguy83/explicit_volume_ls 
Make `docker volume` behave like `docker network`
 2015-10-08 11:36:51 -07:00