a40c828040
Windows: Fix unit tests parsers\os
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-02 11:28:47 -08:00
45e71a7984
Fix bug in initializeNetwork()
...
- On `docker run --net <network id> ...`
the bug would cause the container to attempt
to connect to the network two times
- Also made sure endpoint creation rollback will
be executed on failures in `func (container *Container) connectToNetwork()`
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-02 11:20:15 -08:00
6c31a9a50d
Merge pull request #17594 from mrjana/restart
...
Fix race with host networking causing `invalid argument` errors
2015-11-02 13:46:43 -05:00
4a54ab387f
Add TESTDIRS back
...
Makes it simpler to test only one package.
Was removed by #17491 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-02 19:44:09 +01:00
0d881349e8
rebased canonical/json off go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-02 10:23:02 -08:00
6563b7d2e8
Merge pull request #17542 from estesp/restart-root-dir-cleanup
...
Fix integration-cli daemon restart with user namespaces enabled
2015-11-02 09:50:12 -08:00
ca1e2d5782
Merge pull request #17605 from runcom/enhance-err-msg
...
graph: enhance err message on failed image restore
2015-11-02 08:49:43 -08:00
10e1b9f02e
Vendoring libnetwork
...
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-11-02 08:33:52 -08:00
c70d1bde63
Update linting tools
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:32:49 -08:00
7aa28b6bdd
Fix go vet warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:28:34 -08:00
270e8cf64d
Fix golint warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:02:25 -08:00
ca0a9913c3
Merge pull request #17609 from LK4D4/fix_format
...
Fix error formatting
2015-11-02 10:34:29 -05:00
b087846c0e
Fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 06:51:48 -08:00
38d3fc00d3
Merge pull request #17602 from HuKeping/update-history
...
Update logic of history
2015-11-02 13:55:32 +01:00
a82f9ac819
increase the maxJSONDecodeRetry in json log reader
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-02 17:51:22 +08:00
f5fc832b6e
graph: enhance err message on failed image restore
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-02 10:10:23 +01:00
6694326d5d
Added c.Assert statements to docker_api_create_test.go
...
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.
Removed check.commentf in c.Assert statements
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-01 19:54:19 -08:00
c6fd886db3
Merge pull request #17601 from moxiegirl/moving-project
...
Moving project to docker/opensource
2015-11-02 12:44:41 +10:00
e400125b66
Moving project to docker/opensource
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 18:39:10 -08:00
5a3236d9e8
Update logic of history
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-11-02 10:27:54 +08:00
e2e2ea401a
Merge pull request #17591 from moxiegirl/remove-old-api
...
Remove old api docs that are no-longer appearing on docs-docker.com
2015-11-01 12:30:58 -08:00
1340d456ad
Merge pull request #17572 from Microsoft/10662-parserskernel
...
Windows: Fix parsers kernel test
2015-11-01 10:37:22 -08:00
d2382f7b96
Remove old api docs that are no-longer appearing on docs-docker.com
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:22:10 -08:00
e2a879bedd
Merge pull request #17590 from moxiegirl/fix-122-link
...
Update to hide the 1.10 material
2015-11-01 17:06:44 +01:00
e4d86c2c38
Update to hide the 1.10 material
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-01 08:03:08 -08:00
d4bf773d27
Merge pull request #17583 from moxiegirl/link-fixes
...
Fixing broken links
2015-11-01 16:44:15 +01:00
670fd201de
Windows: Fix parsers kernel test
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-01 07:05:16 -08:00
29c9717cac
Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
...
refactor docker_cli_netmode_test .go with Assert statement
2015-11-01 11:07:54 +01:00
5ce093e945
Fixing broken links
...
Fixing the weight
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-31 19:45:56 -07:00
0c57b9f5b3
Fix integration-cli daemon restart with user namespaces enabled
...
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-31 14:39:33 -04:00
4468e1e74e
Merge pull request #17567 from Microsoft/10662-lxcunittest
...
Windows: Fix go test in execdriver\lxc
2015-10-31 09:40:19 -07:00
8d584da96e
Merge pull request #17568 from Microsoft/10662-journald
...
Windows: Fix journald compile error
2015-10-31 09:35:39 -07:00
5452954d89
Windows: Fix journald compile error
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:31:25 -07:00
30ab497e17
Windows: Fix go test in execdriver\lxc
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:25:36 -07:00
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
ed6e3cf704
Merge pull request #17537 from mountkin/fix-logger-race
...
fix a race in json logger reader
2015-10-30 23:00:17 -07:00
f87082f08e
Merge pull request #17545 from LK4D4/writehs_encode
...
Use json.Encoder for container.writeHostConfig
2015-10-30 21:11:15 -04:00
cccb6bce7d
Merge pull request #17524 from mountkin/fix-teardown
...
dont try to remove builtin networks in teardown
2015-10-30 20:59:57 -04:00
2e466bafda
Merge pull request #17548 from mavenugo/ugr
...
Vendoring libnetwork to fix #17526 & #17527
2015-10-30 17:13:40 -07:00
09cb1f1121
Merge pull request #17529 from Microsoft/10662-builderisolation
...
Windows: [TP4] Allows --isolation on docker build
2015-10-30 17:10:04 -07:00
6d8aff07ac
Merge pull request #17547 from LK4D4/unn_stat
...
Remove unnecessary Stat check from readHostConfig
2015-10-30 16:56:11 -07:00
9bf20c6847
Merge pull request #17549 from donhcd/fixPre122Stats
...
fix pre-1.21 docker stats
2015-10-30 16:45:41 -07:00
e16e794805
IT for daemon restarts when container connected to multiple networks
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 16:25:25 -07:00
401632c756
fixing ungraceful daemon restart case where nw connect is not persisted
...
For graceful restart case it was done when the container was brought
down. But for ungraceful cases, the persistence is missing for nw
connect
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-30 16:24:02 -07:00
2361edbcea
Vendoring in libnetwork to fix an ungraceful restart case
...
Also picked up a minor typo fix
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-30 16:24:02 -07:00
a54d5932e3
Turn IPC unmount errors into warnings.
...
And do not try to unmount empty paths.
Because nobody should be woken up in the middle of the night for them.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 19:13:52 -04:00
33f5429786
Merge pull request #17538 from calavera/deprecated_bridge_interface
...
Fix network inspect for default networks.
2015-10-30 16:03:51 -07:00
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
0c991f3d68
Merge pull request #16779 from Microsoft/10662-execdrivercommand
...
Windows: Refactor execdriver.Command
2015-10-30 14:59:59 -07:00
36a69bbc60
Remove unnecessary Stat check from readHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 14:54:09 -07:00
John Howard
Alessandro Boch
Tibor Vass
Vincent Demeester
Jessica Frazelle
Alexander Morozov
Jana Radhakrishnan
Alexander Morozov
Doug Davis
Vincent Demeester
Shijiang Wei
Antonio Murdaca
Zuhayr Elahi
Sven Dowideit
Mary Anthony
Hu Keping
Sebastiaan van Stijn
Antonio Murdaca
Phil Estes
Arnaud Porterie
Brian Goff
David Calavera
Madhu Venugopal
Alexandre Beslic
Donald Huang