2f6a89e161
modifying docker --since and --until to support nanoseconds and time zones
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 430d8ff6113e41edc4605267081fa424a9bfe19f
Component: engine
2015-11-13 09:56:15 -06:00
f5a3f3f5b7
Merge pull request #17722 from jeroenj/patch-1
...
Fixes typo in docs/userguide/dockervolumes.md
Upstream-commit: c05e1b7d57c31e2490676370428544a06e2ba636
Component: engine
2015-11-05 16:22:32 +01:00
dcbc728ac9
Fixes typo in docs/userguide/dockervolumes.md
...
Signed-off-by: Jeroen Jacobs <git@jeroenj.be >
Upstream-commit: 75602d4930e7b7fa7c958329b544401756991d88
Component: engine
2015-11-05 16:08:11 +01:00
50aae3f0be
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
Upstream-commit: 22ef779db97362bbb8122933e32d87d92c7a0489
Component: engine
2015-11-05 15:15:52 +01:00
5299efe664
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
Upstream-commit: bb9eca90363eec052e101bb8ef3351d0218dccf9
Component: engine
2015-11-05 09:15:28 -05:00
281fcbcfb6
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
Upstream-commit: 71db33738d681ab7855998e414d426fcc26f16ea
Component: engine
2015-11-05 13:05:28 +01:00
0e4d37bec5
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
Upstream-commit: f267e4be54170855693d240e605ff9a4ee8e891d
Component: engine
2015-11-05 12:11:57 +01:00
f2cce82a28
Merge pull request #17717 from WeiZhang555/docsAndTypo
...
Fix docs typo and wrong word
Upstream-commit: 5baf56ca008fb221c45714a21cc3eca6db66c475
Component: engine
2015-11-05 11:35:33 +01:00
7aba578a99
Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error
...
Reutrn immediately when inspect connection failed
Upstream-commit: 1eafc7264cd4e2d4acd9944683326234f06ec9ef
Component: engine
2015-11-04 22:43:02 -08:00
1172f3e1fb
Fix docs typo and wrong word
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 725b7c9d4332aee7bac0fa1bedacbabc6d2a2426
Component: engine
2015-11-05 14:17:37 +08:00
cdd39c3396
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 72aeb63a47bcdffe15380302ff09ab3f0447e476
Component: engine
2015-11-04 21:17:05 -05:00
fa6a6b811f
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
Upstream-commit: f18c5e9714face6eaa4ff63a32ecd6f01444ef4b
Component: engine
2015-11-04 19:23:11 -05:00
090b8fbc23
Merge pull request #17694 from hrldcpr/patch-1
...
fix documentation inconsistency for volume create
Upstream-commit: 1ef3b1f857859d8407155f88c86b9e2aee20955d
Component: engine
2015-11-05 01:16:09 +01:00
bedb26558b
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3f2747943583c06dc3ee1744a5ffa4ce7c099c7c
Component: engine
2015-11-04 16:01:19 -08:00
e3dc181362
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
Upstream-commit: 236913f4e825d747b091e8eda07b48f8d62a41a9
Component: engine
2015-11-05 00:50:08 +01:00
63911eff34
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
Upstream-commit: 9c1006c8bf2efc71659ec3b5412ce987661decca
Component: engine
2015-11-04 15:39:19 -08:00
f9edf991b3
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 9112d90b27c3bf13b8d1c41eb288c63868c53747
Component: engine
2015-11-04 14:43:50 -08:00
9d6270e06f
Merge pull request #17705 from alexwlchan/patch-1
...
Fix typo in dockervolumes.md
Upstream-commit: fa0ee3fb89289049a506376fb1356797e07d0932
Component: engine
2015-11-04 14:26:47 -08:00
d20f80e318
Fix typo in dockervolumes.md
...
Signed-off-by: Alex Chan <alex@alexwlchan.net >
Upstream-commit: 40dc0c4861df0e087ffe43c416176a58f574e641
Component: engine
2015-11-04 22:13:35 +00:00
a73cd6bc2a
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
Upstream-commit: b2f14f9bec0c4c8f14e9ac5446fbb49d88310bae
Component: engine
2015-11-04 13:37:45 -08:00
6cd1649ca5
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 54d22cbd9a04a965c935a693bf403d2c87109b5a
Component: engine
2015-11-04 13:27:17 -08:00
32476a2302
Merge pull request #17698 from moxiegirl/nigel-fixes
...
Fixing BTRFS > Btrfs
Upstream-commit: 92132a7841883d912ab2003dc2aa956ceaa05bdb
Component: engine
2015-11-04 22:05:27 +01:00
f66555fbae
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 41de7a18d8f231568977e66bb58a6a02545d49d9
Component: engine
2015-11-04 15:18:50 -05:00
d016054c79
Merge pull request #17184 from cpuguy83/fix_external_volume_tests
...
Fix bug in volume driver test implementation
Upstream-commit: 37849ce1fbba7dd32110d78c0d7db0074afd67e9
Component: engine
2015-11-04 12:08:11 -08:00
03adf0dbf2
Merge pull request #17695 from runcom/restore-images-log
...
graph: do not error out if images can't be restored
Upstream-commit: 0cdc96cd8f04c3e34eae0712c81e4d4129ae8029
Component: engine
2015-11-04 11:45:44 -08:00
385f68dfda
Merge pull request #17578 from brahmaroutu/fix_unit_tests_gccgo
...
after the changes to unit test framework, fixing gccgo to run unit tests
Upstream-commit: d718388df71b3b56d71564f706ffde7c625dde02
Component: engine
2015-11-04 20:35:17 +01:00
b92bac632d
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d4a8d09d1a7ced5c711fcc7a939986d22a0554eb
Component: engine
2015-11-04 11:34:05 -08:00
61a7faaa73
Fixing BTRFS > Btrfs
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32
Component: engine
2015-11-04 11:23:16 -08:00
9568550083
graph: do not error out if images can't be restored
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: eaa4047792d2495276383332c4ad4c573e5e8275
Component: engine
2015-11-04 19:46:54 +01:00
207b056583
fix documentation inconsistency for volume create
...
the example command uses `/world` but the description refers to `/src`
Signed-off-by: Harold Cooper <hrldcpr@gmail.com >
Upstream-commit: f67da614e9963e626d4ec12fd624249947b97d6a
Component: engine
2015-11-04 13:22:53 -05:00
a0c47a9e10
Merge pull request #17662 from calavera/decouple_container_and_daemon
...
Remove daemon field from within container.
Upstream-commit: 55711a22e0fdd339ef5196d9ecf282b93cd2b8bb
Component: engine
2015-11-04 10:21:58 -08:00
1820467533
Remove further references to the daemon within containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 63efc12070b2aff0f062ad62cc577cf2ffb66ef6
Component: engine
2015-11-04 12:28:54 -05:00
2b73c2cc80
Remove daemon field from container.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 444c82d19d3c8ee51f313c879d434ac5b8be6a6f
Component: engine
2015-11-04 12:27:49 -05:00
c61aec7054
Decouple daemon and container from the stats collector.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5dc3a9a6da6ce6e3eee791251293cf045a4754f9
Component: engine
2015-11-04 12:27:49 -05:00
0e98961ec3
Decouple daemon and container to configure logging drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c412300dd9f85301e2922ccc7c954eaa37fadcab
Component: engine
2015-11-04 12:27:49 -05:00
ed39402a61
Decouple daemon and container to manage networks.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 669949d6b436d2fc182b427a5e2b38b3bd77c743
Component: engine
2015-11-04 12:27:48 -05:00
ae0ea71e8c
Decouple daemon and container to cleanup containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 019c337b93d5e068fa7c701d8b70750052503188
Component: engine
2015-11-04 12:27:48 -05:00
cf2d677f4e
Decouple daemon and container to log events.
...
Create a supervisor interface to let the container monitor to emit events.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ca5ede2d0a23cb84cac3b863c363d0269e6438df
Component: engine
2015-11-04 12:27:48 -05:00
8678b0dd0d
Decouple daemon and container to manage volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 2c72015ce3b78b45e33529368fb1c5a724415d87
Component: engine
2015-11-04 12:27:48 -05:00
ad803b2d26
Decouple daemon and container to execute processes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c1c42db060362e400a475dfb2884f89b86fce317
Component: engine
2015-11-04 12:27:48 -05:00
28971757bb
Move Daemon.containerCopy to daemon/archive.go
...
It's the only place where it's used.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ebf707ec5fc9e942b89f6405df35cd6c0fabb15b
Component: engine
2015-11-04 12:27:48 -05:00
c4c84fb5f6
Remove unused function Container.getImage.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 89decc4446ad01a5595de1b93c17c37232f8a9aa
Component: engine
2015-11-04 12:27:48 -05:00
6943fc8dc1
Remove unnecessary Container.changes function.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6ea9a880dc434446c072ac23b1cab89ec3652140
Component: engine
2015-11-04 12:27:48 -05:00
b52340d649
Decouple daemon and container to mount and unmount filesystems.
...
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3a497650464b40191bd2cde348e676acf4efe270
Component: engine
2015-11-04 12:27:47 -05:00
57930f801e
Decouple daemon and container to export containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1c94f5f53a47997f76cafb633092fce9dbdab3ea
Component: engine
2015-11-04 12:27:47 -05:00
d721eb8e53
Decouple daemon and container to pause and unpause containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9f79cfdb2f1f6aeb64c84e7cb877fc38d052d187
Component: engine
2015-11-04 12:27:47 -05:00
41d5167da1
Decouple daemon and container to stop and kill containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4f2a5ba360d0b00213d31f50a5be074c89124c52
Component: engine
2015-11-04 12:27:47 -05:00
aecf79764a
Move exportContainerRw to the daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 581380cc6cd26f43fe5e69965873769d8dc739ef
Component: engine
2015-11-04 12:27:47 -05:00
8ed1354382
Merge pull request #17664 from jfrazelle/fedora-23
...
add fedora 23
Upstream-commit: 7e5f90483039eeaa5a4b6d17ec0f688e68f7d768
Component: engine
2015-11-04 08:27:54 -08:00
8f08862095
Merge pull request #17683 from haoshuwei/fix-wordspelling-in-network
...
Fixing wrong word spelling in api/client/network.go
Upstream-commit: fbd18cbce75d3e77db45f3eefaed0237cdb43ed4
Component: engine
2015-11-04 16:02:08 +01:00
