Derek McGowan
a438494b49
Replace docker-compose installation instructions
...
Use Docker Compose installation guide from official documentation
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 13:19:55 -07:00
Derek McGowan
b39e6395fd
Update docker image
...
Use dmcgowan/docker-integration until can push to distribution namespace
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 13:19:55 -07:00
Derek McGowan
4ebd6b7e1d
Add support for docker volume
...
Added an environment variable which can be used to pass in the docker volume for the container. This allows caching the pulled images between runs, preventing unnecessary image pulls.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 13:19:55 -07:00
Derek McGowan
de638db71e
Add bats script to replace test_docker.sh
...
Remove Makefile in favor of run.sh script or manual instructions.
Update readme to reflect instructions for running integration tests.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 13:19:50 -07:00
Christy Perez
77bd53adfe
Update doc with usage of the scratch image
...
The scratch image used to be a regular image, but as of
commit 8936789919 it is a
special case, and cannot be used with 'docker pull.'
Update this doc to reflect the new behavior and clear up
confusion surrounding this image.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-06-05 14:47:03 -05:00
Alexandre Beslic
0a253a22bc
Add specific tests for each store
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 11:48:46 -07:00
Arnaud Porterie
79621c7728
Container don't inherit from image labels
...
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.
It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.
Fixes #13770 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-05 11:11:22 -07:00
Alexandre Beslic
f08bf5de21
Add PutEphemeral test for Zookeeper, implement Close method in Store interface
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 11:01:41 -07:00
Jeffrey Morgan
1efdb51322
Merge branch 'master' of github.com:kitematic/kitematic
2015-06-05 11:00:22 -07:00
Jeffrey Morgan
577858f9a1
Fixed docs to no longer mention copying binaries
2015-06-05 10:56:38 -07:00
Alexandre Beslic
8142a3189e
return placeholder chan for zookeeper lock, remove check in Lock/Unlock test
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 10:56:17 -07:00
Alexandre Beslic
9a8edbc9e1
Factor code in store_test.go and fix key format in etcd Watches
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 10:56:17 -07:00
Alexandre Beslic
4b53c92081
Add timeouts for watch tests
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 10:56:17 -07:00
Alexandre Beslic
18cfe74d5b
store: Add unit tests for pkg/store and Consul/Zookeeper/Etcd
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-05 10:56:17 -07:00
Vojta Bartos
4b708f2275
Making condition simple
...
- removed checking for undefined, not necessary
2015-06-05 19:49:18 +02:00
Jessie Frazelle
5c051e2e26
Merge pull request #13767 from duglin/TweakInNetOpts
...
Remove duplicate call to net.ParseIP
2015-06-05 10:46:31 -07:00
Stephen Day
bd535a882d
Merge pull request #595 from HuKeping/addtest
...
Test: add test for health/check
2015-06-05 10:34:16 -07:00
Alexander Morozov
078b8e54e4
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
2015-06-05 10:27:58 -07:00
Sean Li
6c0b32c8e9
Sidebar polish.
2015-06-05 10:23:26 -07:00
Arnaud Porterie
efe5c64768
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
2015-06-05 10:16:24 -07:00
Sebastiaan van Stijn
69c2f5649a
Merge pull request #13748 from icecrime/experimental_docs
...
Minor changes to experimental docs
2015-06-05 19:11:51 +02:00
Sean Li
d04ebeac13
Header refactor and button styles.
2015-06-05 10:06:49 -07:00
Jessica Frazelle
0adfb908a6
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-05 09:50:30 -07:00
Doug Davis
b180de55ca
Remove duplicate call to net.ParseIP
...
and a little cleanup
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-05 09:44:10 -07:00
Jeffrey Morgan
340e7574dc
Merge pull request #601 from TeckniX/use-document-folder
...
Moved Kitematic dir to Documents
2015-06-05 09:40:05 -07:00
Tibor Vass
bfed4b7cc3
Refactor TLS code with a new tlsconfig package
...
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.
The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.
On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-06-05 12:38:38 -04:00
Phil Estes
edb7e84ddb
Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs
...
Fix goroutine leak on logs -f with no output
2015-06-05 11:43:47 -04:00
TeckniX
3cede9eb74
Moved Kitematic dir to Documents
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-06-05 11:10:10 -04:00
Evan Hazlett
30c2086cdf
Merge pull request #1304 from nathanleclaire/integration_continues
...
Add some helpers and patch ups to the integration tests
2015-06-05 11:07:44 -04:00
Brian (bex) Exelbierd
d32e01be1a
Fixing typo in Dockerfile manpage
...
Signed-off-by: Brian Exelbierd <bex@pobox.com >
2015-06-05 16:33:11 +02:00
Evan Hazlett
f6a6a1f8c8
Merge pull request #1222 from zchee/update-amazonec2-ami
...
Update AMI to release 20150603
2015-06-05 10:30:57 -04:00
Evan Hazlett
d1d4625d99
Merge pull request #1288 from ehazlett/base-os-docs
...
docs: more info about supported base operating systems
2015-06-05 09:52:12 -04:00
Sven Dowideit
159f5e0137
Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5
...
Bring over DHE docs updates for publishing
2015-06-05 21:07:57 +10:00
Sven Dowideit
9ed2cb300b
Bring over DHE docs updates for publishing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-06-05 21:06:59 +10:00
Hu Keping
5680d7b8b7
Test: add test for health/check
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-06-05 18:02:34 +08:00
Chanwit Kaewkasi
74592b8462
integration tests for resource limitation
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-06-05 15:24:19 +07:00
Vojta Bartos
955a43a14d
Fix bug where we want to set custom shell
...
- at container details sub header
- tried to access to array like object
- added reduce function to make array object
2015-06-05 10:11:04 +02:00
Eric-Olivier Lamey
5fa60149e2
Restore --default-gateway{,-v6} daemon options.
...
This was added before the libnetwork merge, and then lost. Fixes #13755 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-05 06:21:22 +00:00
Jeffrey Morgan
6f7d9b80e7
Reverting DockerUtil.js
2015-06-04 23:08:52 -07:00
Jeffrey Morgan
3a52e1c3f2
Mock the remote module
2015-06-04 22:12:18 -07:00
Jeffrey Morgan
cefd299604
Fix integration tests
2015-06-04 20:16:13 -07:00
Jeffrey Morgan
9628a00ab2
Update CONTRIBUTING.md
2015-06-04 20:14:23 -07:00
Jeffrey Morgan
42b6271a34
Update CONTRIBUTING.md
2015-06-04 20:13:34 -07:00
Jeffrey Morgan
7d0d63e5c3
Update CONTRIBUTING.md
2015-06-04 20:13:21 -07:00
Jeffrey Morgan
aa9aa696ff
Fix file downloads
2015-06-04 19:47:44 -07:00
Jeffrey Morgan
47967507dc
Windows installer
2015-06-04 19:25:22 -07:00
Jeffrey Morgan
94113feaed
Do not save sourcemaps
2015-06-04 19:16:43 -07:00
Jeffrey Morgan
44412ad26a
Use babel-jest to preprocess test files
2015-06-04 19:15:22 -07:00
Jeffrey Morgan
4d82006b57
Fixed bug where an error pulling repos would instead show an unrelated 404 error
2015-06-04 19:08:41 -07:00
Victor Vieux
7e4cde9d08
Merge pull request #904 from vieux/fix_reserved_cpus_computation
...
Fix reserved cpus computation
2015-06-04 19:07:20 -07:00