docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
5852db4d72 Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
250a7a530b Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
4e8b017283 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-05-04 11:52:56 -07:00
Vladimir Lagunov
a86a195c50 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
3368887a29 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
e5f1429ce1 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
65b0e5973b updated cli_test.py to no longer expect raised SystemExit exceptions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
9cf483e224 Added code to output the top level command options if docker-compose help with no command options provided 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
1e164ca802 Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
a2ded237e4 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
8a9ab69a1c Check full error message in test_up_with_net_is_invalid 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
9cfbfd55c4 Remove v2_only decorators on config tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Riyaz Faizullabhoy
7977c6a965 Merge pull request #713 from twistlock/list_targets_basic_auth 
Enable basic authentication for list command
 2016-05-04 11:50:57 -07:00
Joffrey F
d41e6e00fa Merge remote-tracking branch 'source/release' into bump-1.7.1 2016-05-04 11:49:05 -07:00
Michael Holzheu
8ba8189ee6 TestApiStatsContainerGetMemoryLimit: Add cgroup memory test 
Currently on kernels booted without the "cgroup_enable=memory" kernel
parameter the testcase TestApiStatsContainerGetMemoryLimit fails with:

FAIL: docker_api_stats_test.go:231: TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite

docker_api_stats_test.go:256:
    c.Assert(fmt.Sprintf("%d", v.MemoryStats.Limit), checker.Equals, fmt.Sprintf("%d", info.MemTotal))
... obtained string = "0"
... expected string = "33759145984"

Fix this and skip the testcase if the kernel does not support cgroup memory
limit. In that case the output would be:

SKIP: docker_api_stats_test.go:231:
TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite
(Test requires an environment that supports cgroup memory limit.)

ChangeLog:
----------
v4: Move TestApiStatsContainerGetMemoryLimit to docker_api_stats_unix_test.go
v3: Use existing "memoryLimitSupport" from requirements_unix.go
v2: Move check to requirements.go

Fixes #22477

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-05-04 20:46:41 +02:00
Ying Li
b10e89e0c0 Fix signer to conform to expected signed.CryptoService behavior. 
In interface tests, account for the fact that the signer doesn't keep track of roles yet.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-04 11:45:40 -07:00
Derek McGowan
48aac6834a Merge pull request #1701 from RichardScothern/updates 
Update AUTHORS and version file
 2016-05-04 11:04:48 -07:00
Richard Scothern
c1c230dee9 Merge pull request #1626 from RichardScothern/alpine 
Use Alpine Linux as the parent image for the registry.
 2016-05-04 11:03:42 -07:00
Garrett Seward
3b7191f246 Small typo 
Signed-off-by: spectralsun <garrett@spectralsun.com>
 2016-05-04 10:47:01 -07:00
Richard Scothern
35dd23c649 Update AUTHORS and version file 
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
 2016-05-04 10:22:07 -07:00
Richard Scothern
c047d34b22 Merge pull request #1695 from tonyhb/add-regulator-to-filesystem 
Add regulator to filesystem
 2016-05-04 10:05:51 -07:00
Antonio Murdaca
66fbc0c2a3 distribution: errors: do not retry on too many requests from registry 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-04 18:57:55 +02:00
Antonio Murdaca
305ebfda8b vendor docker/distribution 9ec0d742d6 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-04 18:57:35 +02:00
Antonio Murdaca
9613acbe5c integration-cli: test load/import with authz plugins 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-04 18:45:22 +02:00
Richard Scothern
9ec0d742d6 Merge pull request #1696 from runcom/go1.6-lol 
registry: do not use http.StatusTooManyRequests
 2016-05-04 09:45:18 -07:00
Liron Levin
f5ce3d1eb0 Enable providing username/password for read operations 
Currently notary fails to authenticate private Docker repositories.
That is, notary fetch a token from `auth.docker.io` but receives 401
(since basic authentication is required to fetch the bearer token for
private Docker repositories).

Since the `AuthenticationHandler` succeed, we must retry the entire flow
with a different handler.

Signed-off-by: Liron Levin <liron@twistlock.com>
 2016-05-04 19:43:45 +03:00
Tianon Gravi
084c72e760 Update contrib/mkimage/debootstrap to account for Debian LTS changes 
See https://www.debian.org/News/2016/20160425 and https://wiki.debian.org/LTS/Using for more details.

> For Debian 7 "Wheezy" LTS there will be no requirement to add a separate wheezy-lts suite to your sources.list any more. In fact you will not notice the switch to LTS because after the official security support by the Debian Security Team ends, security updates will be provided via security.debian.org 's wheezy/updates.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-05-04 08:39:45 -07:00
Brian Goff
973d6f0820 Merge pull request #22422 from cpuguy83/vendor_engine-api 
Update engine-api
 2016-05-04 10:12:29 -04:00
Sebastiaan van Stijn
e7584a7fdf Merge pull request #22499 from duglin/removeQuotes 
Remove unnecessary double-double quotes
 2016-05-04 15:35:45 +02:00
Sebastiaan van Stijn
c14b1e3964 Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs 
Updated docker-info output and documentation
 2016-05-04 15:33:21 +02:00
Vincent Demeester
4c88c67058 Merge pull request #21947 from boynux/fix-filter-exited 
exited=0 in filter shouldn't show "Created" ones
 2016-05-04 15:21:59 +02:00
Vincent Demeester
1c1947dd29 Merge pull request #22386 from wenchma/dockerd 
Update the `docker daemon` to `dockerd` for document
 2016-05-04 15:07:53 +02:00
Doug Davis
8eb2188bd9 Remove unnecessary double-double quotes 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-05-04 05:15:57 -07:00
Sebastiaan van Stijn
9f29f66c29 Merge pull request #22498 from Windfarer/patch-1 
fix typo in docs
 2016-05-04 13:37:28 +02:00
Eric Yang
176e9e2ffc fix typo 
fix typo

Signed-off-by: Qizhao Yang <windfarer@gmail.com>
 2016-05-04 19:18:38 +08:00
Sebastiaan van Stijn
9c52a04f38 Merge pull request #22446 from thaJeztah/add-daemon-reload 
Add support for reloading daemon configuration through systemd
 2016-05-04 12:38:40 +02:00
Sun Hongliang
8a5531777b show container status of each node in docker info 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-04 17:23:45 +08:00
Ronak Banka
1a5ac12dd3 Align machine storage path flag name 
Signed-off-by: Ronak Banka <ronak.banka@rakuten.com>
 2016-05-04 16:52:00 +09:00
Riyaz Faizullabhoy
6bd4f94199 add positive test for passphrase caching 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-05-03 18:10:48 -07:00
Ying Li
b83fd7842b Add a general interface test for signed.CryptoService specifying expected interface behavior. 
Apply it to cryptoservice.CryptoService and signed.client.NotarySigner.

Signed-off-by: Ying Li <ying.li@docker.com>
 2016-05-03 17:00:55 -07:00
Dongluo Chen
9a968f5c5d Merge pull request #2207 from dongluochen/bump-1.2.1 
Bump version to v1.2.1
 2016-05-03 16:41:40 -07:00
Tony Holdstock-Brown
c9c62380ff Don't wrap thead limits when using a negative int 
Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
 2016-05-03 16:03:44 -07:00
Riyaz Faizullabhoy
d08ecc770f Update RethinkDB to 2.3.0, gorethink to v2 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-05-03 15:47:30 -07:00
Dong Chen
63418b2d63 Bump version to v1.2.1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-03 15:36:07 -07:00
Joao Fernandes
53acf5b769 Fixes doc P0s for 2.0 release 2016-05-03 15:27:44 -07:00
Dongluo Chen
b2de64872b Merge pull request #2205 from dongluochen/containerslots 
Containerslots
 2016-05-03 15:11:39 -07:00
Nishant Totla
31909bf847 Merge pull request #2200 from allencloud/use--cpu-shares-instead-of--c-since-deprecated 
use --cpu-shares instead of -c in integration test
 2016-05-03 14:44:49 -07:00
Dong Chen
c4007e9507 Carry over pr/2137 with minor updates. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-03 14:29:38 -07:00
Sebastiaan van Stijn
82141a28f5 Merge pull request #22482 from anujbahuguna/master 
Adding Rita Levi-Montalcini and Claude Shannon to name generator
 2016-05-03 22:28:16 +02:00
Alexander Morozov
5892083a8f Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing 
minor contributing.md cleanup
 2016-05-03 13:15:26 -07:00