Daniel Nephin
53a0de7cf2
Add missing title to compose file reference.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-02 15:16:23 -05:00
David Calavera
beeec6d103
Merge pull request #17558 from aboch/nw
...
Fix bug in initializeNetwork()
2015-11-02 12:15:41 -08:00
Daniel Nephin
3738da09e2
Merge pull request #2298 from dnephin/update_networking_test_for_rc4
...
Fix networking tests to work with new API in engine rc4
2015-11-02 15:10:17 -05:00
Stephen J Day
46dd057f5c
registry/storage: close filereader after allocation
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-11-02 11:55:11 -08:00
Richard Scothern
c6c9194e9c
Merge pull request #1148 from aaronlehmann/withname-check-length
...
Check length of input in WithName
2015-11-02 11:54:34 -08:00
David Calavera
920ab75bd5
Merge pull request #17598 from zelahi/16756-dockercli-createtest
...
Added c.Assert statements to docker_api_create_test.go
2015-11-02 11:43:20 -08:00
David Calavera
b95048758a
Merge pull request #17619 from jfrazelle/canonical-update
...
rebased canonical/json off go 1.5.1
2015-11-02 11:42:26 -08:00
David Calavera
f962c0715f
Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
...
Bring TESTDIRS back for unit-tests
2015-11-02 11:41:19 -08:00
John Howard
a40c828040
Windows: Fix unit tests parsers\os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-02 11:28:47 -08:00
Alessandro Boch
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
Daniel Nephin
abde64d610
On a test failure only show the last 100 lines of daemon output.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-02 14:16:52 -05:00
David Lawrence
ab6637934d
Merge pull request #258 from mtrmac/unused-sha256
...
Don't compute an unnecessary cryptographic hash
2015-11-02 11:12:39 -08:00
Tibor Vass
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
Vincent Demeester
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
Daniel Nephin
1b5b407619
Fix networking tests to work with new API in engine rc4 ( https://github.com/docker/docker/pull/17536 )
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-02 13:40:56 -05:00
Jessica Frazelle
8e8c2977da
rebased canonical/json off go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-11-02 10:26:42 -08:00
Jessica Frazelle
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
Alexander Morozov
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
Jeffrey Morgan
10d50a0959
Bump for 1.9.0 rc4
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-02 09:40:25 -08:00
Aaron Lehmann
073bd89262
Check length of input in WithName
...
There is a constraint on the length of the name in a reference, so
WithName should be checking this instead of potentially creating a
reference that doesn't comply with the rules.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-11-02 09:12:21 -08:00
Alexander Morozov
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
Sebastiaan van Stijn
e41de3e631
Add examples for ENV vars in API
...
As discussed in https://github.com/docker/docker/issues/16623 ,
the API calls for setting ENV-vars lacked an actual example.
This PR adds some examples to the API calls.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-11-02 17:44:31 +01:00
Jana Radhakrishnan
10e1b9f02e
Vendoring libnetwork
...
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-11-02 08:33:52 -08:00
Alexander Morozov
c70d1bde63
Update linting tools
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-02 08:32:49 -08:00
Alexander Morozov
7aa28b6bdd
Fix go vet warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-02 08:28:34 -08:00
Alexander Morozov
270e8cf64d
Fix golint warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-02 08:02:25 -08:00
Doug Davis
ca0a9913c3
Merge pull request #17609 from LK4D4/fix_format
...
Fix error formatting
2015-11-02 10:34:29 -05:00
Alexander Morozov
b087846c0e
Fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-02 06:51:48 -08:00
Miloslav Trmač
29ae808472
Don't compute an unnecessary cryptographic hash
...
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
2015-11-02 15:27:02 +01:00
Alexandre Beslic
8a2897e141
Add configurable discovery
...
This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.
If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-11-02 06:10:50 -08:00
Vincent Demeester
38d3fc00d3
Merge pull request #17602 from HuKeping/update-history
...
Update logic of history
2015-11-02 13:55:32 +01:00
Shijiang Wei
a82f9ac819
increase the maxJSONDecodeRetry in json log reader
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-11-02 17:51:22 +08:00
Antonio Murdaca
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
John Howard
864e892e2a
Windows: Fix dockerfile\parser unit test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-01 20:08:37 -08:00
Zuhayr Elahi
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
Sven Dowideit
0cd99bcdd8
Merge pull request #22 from moxiegirl/fixed
...
Fixing the build
2015-11-02 12:57:14 +10:00
Mary Anthony
6b9623db37
Fixing the build
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-01 18:53:54 -08:00
Sven Dowideit
d442961887
Merge pull request #21 from moxiegirl/moving-project
...
Moving how to contribute files into opensource
2015-11-02 12:44:56 +10:00
Sven Dowideit
c6fd886db3
Merge pull request #17601 from moxiegirl/moving-project
...
Moving project to docker/opensource
2015-11-02 12:44:41 +10:00
Mary Anthony
e400125b66
Moving project to docker/opensource
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-01 18:39:10 -08:00
Hu Keping
5a3236d9e8
Update logic of history
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-11-02 10:27:54 +08:00
moxiegirl
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
Alexander Morozov
1340d456ad
Merge pull request #17572 from Microsoft/10662-parserskernel
...
Windows: Fix parsers kernel test
2015-11-01 10:37:22 -08:00
Mary Anthony
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
Sebastiaan van Stijn
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
Mary Anthony
e4d86c2c38
Update to hide the 1.10 material
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-11-01 08:03:08 -08:00
Sebastiaan van Stijn
d4bf773d27
Merge pull request #17583 from moxiegirl/link-fixes
...
Fixing broken links
2015-11-01 16:44:15 +01:00
John Howard
670fd201de
Windows: Fix parsers kernel test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-01 07:05:16 -08:00
Diogo Mónica
dfaa8daf9b
Merge pull request #255 from mtrmac/no-P224
...
Don't use elliptic.P224()
2015-11-01 10:32:03 +00:00
Diogo Mónica
fd0775e1dc
Merge pull request #257 from mtrmac/fix-export-root
...
Fix (notary key export-root)
2015-11-01 10:31:29 +00:00