docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,436 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2367 Commits

Author SHA1 Message Date
Donald Huang d2c04f844b fix pre-1.22 docker stats 
This fixes a bug introduced in #15786:

* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629

Signed-off-by: Donald Huang <don.hcd@gmail.com>
 2015-10-30 22:28:03 +00:00
Alexander Morozov 23a0fe9627 Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling 
Force IPC mount to unmount on daemon shutdown/init
 2015-10-30 14:40:42 -07:00
David Calavera 85d7bbf7aa Merge pull request #17528 from LK4D4/todisk_encode 
Use json.Encoder for container.toDisk
 2015-10-30 14:36:42 -07:00
Tibor Vass 74362e8392 Merge pull request #17531 from crosbymichael/no-set-reservation 
Don't set mem soft limit if not specifiecd
 2015-10-30 17:01:36 -04:00
Alessandro Boch d795bc7d53 Modify IPAMConfig structure json tags 
- So that it complies with docker convention for inspect

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 12:57:49 -07:00
Brian Goff 78bd17e805 Force IPC mount to unmount on daemon shutdown/init 
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.

This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-30 15:41:48 -04:00
Jess Frazelle 0aa3bff482 Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild 
Build broken on master (awslogs)
 2015-10-30 10:39:48 -07:00
Brian Goff 17a8fbeaeb Merge pull request #17514 from mavenugo/ugr 
Fixing a case of dangling endpoint during ungraceful daemon restart
 2015-10-30 13:38:27 -04:00
Michael Crosby ecb87ed0a5 Don't set mem soft limit if not specifiecd 
You cannot do this for individual cgroups for all the containers.  Only
set the reservation if the user requested it.  The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-10-30 10:34:01 -07:00
John Howard 2716e3964d Windows build broken on master (awslogs) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-30 10:02:32 -07:00
Tibor Vass c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver 
[awslogs] Auto-detect region and set user-agent
 2015-10-30 12:38:40 -04:00
Michael Crosby aadae4b503 Merge pull request #16412 from Microsoft/10662-hyper-v-containers 
Windows [TP4]: Adds support for Hyper-V Containers
 2015-10-30 09:34:16 -07:00
Alexander Morozov cf02b369e0 Use json.Encoder for container.toDisk 
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-30 09:29:53 -07:00
Antonio Murdaca e990eca1e5 Merge pull request #17510 from LK4D4/refactor_shutdown 
Refactor Shutdown a little to reduce indentation
 2015-10-30 12:24:03 +01:00
Antonio Murdaca 6b9de7342f Merge pull request #17498 from LK4D4/fix_graph_comment 
Fix Graph() docstring
 2015-10-30 09:48:16 +01:00
Vincent Demeester 81c5b1ce4a Merge pull request #17492 from aidanhs/aphs-remove-dead-code 
Remove dead code
 2015-10-30 08:50:54 +01:00
Madhu Venugopal 0c07096b7d Fixes a case of dangling endpoint during ungraceful daemon restart 
When a container restarts after a ungraceful daemon restart, first
cleanup any unclean sandbox before trying to allocate network resources.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-29 18:56:56 -07:00
Alexander Morozov ace5854f65 Refactor Shutdown a little to reduce indentation 
Also make daemon.netController.Stop() regardless of container existance.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-29 17:20:32 -07:00
Brian Goff 82203d06eb Merge pull request #17497 from LK4D4/put_err 
Do not ignore errors from graphdriver.Put
 2015-10-29 19:37:10 -04:00
John Howard 15e35c4470 Windows: Adds support for Hyper-V Containers 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-29 16:18:52 -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
Alexander Morozov 134772f91e Fix Graph() docstring 
It's not true anymore, it used in builder for example.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-29 11:41:42 -07:00
Alexander Morozov ac4b290552 Do not ignore errors from graphdriver.Put 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-29 11:25:53 -07:00
Aidan Hobson Sayers 164d0bca63 Remove dead code 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-10-29 16:56:29 +00: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
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
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
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
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
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
Samuel Karp 8a6dfb26f3 [awslogs] Auto-detect region on EC2 instances 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-10-27 23:47:28 +00:00
Samuel Karp 480c9c0178 [awslogs] Set User-Agent for Amazon CloudWatch Logs 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-10-27 23:47:19 +00:00
Samuel Karp 70083e6fc3 Update vendored aws-sdk-go 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-10-27 23:43:51 +00: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
David Calavera 82f70677b9 Merge pull request #17405 from LK4D4/cont_pointer 
Return pointer from newBaseContainer
 2015-10-27 13:27:10 -07: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
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
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
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