0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19492 commits 14 branches 412 tags 338 MiB
Commit graph

1299 commits

Author SHA1 Message Date
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
David Calavera
09cb1f1121 Merge pull request #17529 from Microsoft/10662-builderisolation 
Windows: [TP4] Allows --isolation on docker build
 2015-10-30 17:10:04 -07:00
Alexandre Beslic
33f5429786 Merge pull request #17538 from calavera/deprecated_bridge_interface 
Fix network inspect for default networks.
 2015-10-30 16:03:51 -07:00
David Calavera
f301c5765a Fix network inspect for default networks. 
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-30 16:55:21 -04:00
Alessandro Boch
b2d0b75018 Modify Network structure json tags 
- So that they comply with docker inspect convention
  Which is allowing camel case for json field names

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 11:23:59 -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
Vincent Demeester
4f3dd3db5a Merge pull request #17463 from dongluochen/volumeRouter 
extract docker volume API from local
 2015-10-30 08:33:43 +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
Dong Chen
9862a4b43e extract docker volume API from local 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-10-27 17:28:19 -07: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
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
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
David Calavera
e252fe288c Merge pull request #17266 from cpuguy83/dump_http_request_on_debug 
Dump request when daemon is set to debug
 2015-10-26 13:41:14 -07:00
Michael Crosby
5cf028d3dd Merge pull request #17313 from calavera/version_exec_json_check 
Version exec json check.
 2015-10-26 13:32:32 -07:00
David Calavera
0b5e628e14 Version exec json check. 
Keep backwards compatibility with old versions of the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-26 15:12:06 -04:00
Alexander Morozov
34439f3ecb Merge pull request #17351 from mavenugo/predefined 
Prevent user from deleting pre-defined networks
 2015-10-26 10:06:45 -07:00
Madhu Venugopal
ead62b5952 Prevent user from deleting pre-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-25 17:17:29 -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
Tibor Vass
e74cf8acad Merge pull request #16433 from Microsoft/10662-volumes5 
Windows: [TP4] Add volume support
 2015-10-23 18:43:07 -04: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
Brian Goff
37dbe07519 Dump request when daemon is set to debug 
Uses a new middleware which calls httputils.DumpRequest which is output
to `logrus.Debug`.
This is implemented in a separate middleare so that we only have to
check the logging level when the router is instantiated rather than at
every request.
If this was just `logrus.Debug(httputil.DumpRequest(...))`, the
DumpRequest would be called on each request requardless of logging
level set on the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-23 09:04:32 -04: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
Tibor Vass
4c253ddf20 Merge pull request #17275 from vdemeester/17246-tags-to-repotags 
Use RepoTags & RepoDigest in inspect
 2015-10-22 17:14:49 -04:00
Vincent Demeester
f664f6e4b1 Use RepoTags & RepoDigest in inspect 
To be coherent with /images/json (images command)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-22 23:00:59 +02: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
John Howard
a7e686a779 Windows: Add volume support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-22 10:42:53 -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
Brian Goff
c516aa645e Merge pull request #17177 from runcom/bc-fixes 
Return empty Config fields, now omitempty, for API < 1.21
 2015-10-20 16:39:53 -04:00
Tibor Vass
82a8a14c4d Merge pull request #17128 from calavera/network_controller_enabled 
Do not initialize the networking routes when netController is not enabled.
 2015-10-19 16:13:31 -04:00
David Calavera
b27fa6c58e Merge pull request #16957 from MHBauer/eventsservice-refactor 
refactor access to daemon member EventsService
 2015-10-19 11:45:29 -07:00
David Calavera
eb982e7c00 Return 404 for all network operations without network controller. 
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-19 14:40:18 -04:00
Antonio Murdaca
850bc0838a Return empty Config fields, now omitempty, for API < 1.21 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-10-19 19:09:36 +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
Morgan Bauer
2abf5d986e
refactor access to daemon member EventsService 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-10-19 09:41:29 -07:00