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
Ying Li
9303df90d5 Merge pull request #675 from docker/key-id-verification 
Key ID verification
 2016-04-12 13:29:22 -07:00
John Howard
acaef7caaf Windows: Fix flakey LogsSinceFutureFollow 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-04-12 13:27:29 -07:00
Danyal Prout
339ebc0483 Fixes #2096: Only show multiple port clash warning if multiple containers 
are about to be started.

Signed-off-by: Danyal Prout <me@dany.al>
 2016-04-12 20:58:21 +01:00
Tibor Vass
c3fe4226f3 vendor runc to fix issue#21808 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-12 15:35:43 -04:00
Nathan LeClaire
7b62127404 Merge pull request #3300 from ahmetalpbalkan/azure-deps 
azure: Update SDK dependencies for better error messages
 2016-04-12 12:16:07 -07:00
David Calavera
b6a08c3f11 Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners 
pkg: listeners: move Docker-specific semantics to docker/daemon*
 2016-04-12 12:04:03 -07:00
David Lawrence
3354e2f44f Merge pull request #674 from cyli/godep-makefile-check 
Stop using godep in CI and Makefile since we use vendoring now
 2016-04-12 10:45:08 -07:00
Dan Walsh
9caf7aeefd Add support for setting sysctls 
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-04-12 13:37:31 -04:00
Alexander Morozov
d648d40ace Merge pull request #21904 from yongtang/21848-stats-connected-containers 
Docker stats is not working when a container is using another container's network.
 2016-04-12 10:28:05 -07:00
Richard Scothern
c6f63e298e Merge pull request #1619 from RichardScothern/gc-docs 
Extend garbage collection documentation.
 2016-04-12 10:25:43 -07:00
Alexander Morozov
7b5a6844c2 Merge pull request #21943 from Microsoft/jstarks/utilityvm 
Windows: support embedded utility VM images
 2016-04-12 10:19:47 -07:00
Alexander Morozov
8cb511b7d6 Merge pull request #21948 from tianon/check-config-network 
Add "VXLAN" to check-config.sh
 2016-04-12 10:10:48 -07:00
Ahmet Alp Balkan
a6bc7579b7 azure: Update SDK dependencies for better error messages 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2016-04-12 10:10:09 -07:00
Tony Witherspoon
ae46bf8907 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 12:29:59 -04:00
Phil Estes
595104daf6 Merge pull request #21960 from rhcarvalho/shm-validation-typo 
Fix a typo in hostConfig.ShmSize validation
 2016-04-12 12:05:31 -04:00
Tony Witherspoon
276738f733 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 11:47:15 -04:00
Rodolfo Carvalho
fee7e7c7a3 Fix a typo in hostConfig.ShmSize validation 
Other places referring to the same configuration, including docs, have
the correct spelling.

Signed-off-by: Rodolfo Carvalho <rhcarvalho@gmail.com>
 2016-04-12 16:45:05 +02:00
Daniel Nephin
f10bc8072e Merge pull request #3310 from aanand/fix-logs-test 
Attempt to fix flaky logs test
 2016-04-12 10:44:04 -04:00
Aanand Prasad
7781f62ddf Attempt to fix flaky logs test 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-12 12:07:13 +01:00
Aanand Prasad
3d3f331404 Merge pull request #3303 from aanand/clarify-rm-and-down 
Clarify behaviour of rm and down
 2016-04-12 11:31:22 +01:00
Maksim Malchuk
be8f469a82 Correct error handling for external SSH client 
In some cases, (e.g. private key not accessible or has incorrect
permissions) docker-machine failed with error "Something went wrong
running an SSH command!". This commit will add the correct debug
messages and show the correct errors for the bad private keys.
Also, due to incorrect handling POSIX file permissions in Windows
some checks should be ignored.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
 2016-04-12 11:43:18 +03:00
Vincent Demeester
a0e7e13766 Merge pull request #21818 from Microsoft/jjh/tp4fortests 
Windows: Remove TP4 support from test code
 2016-04-12 10:07:12 +02:00
Aleksa Sarai
5ee0a94101 pkg: listeners: move Docker-specific semantics to docker/daemon* 
Since there are other users of pkg/listeners, it doesn't make sense to
contain Docker-specific semantics and warnings inside it. To that end,
move the scary warning about -tlsverify and the libnetwork port
allocation code to CmdDaemon (where they belong). This helps massively
reduce the dependency tree for users of pkg/listeners.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-12 12:50:43 +10:00
mYmNeo
34a66a14af Grow the container rootfs when it is necessary 
Signed-off-by: mYmNeo <thomassong@tencent.com>
 2016-04-12 09:27:47 +08:00
Richard Scothern
f9bcbd44ca Extend garbage collection documentation. 
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
 2016-04-11 17:43:25 -07:00
David Lawrence
55aee374e1 fixing some certs tests as additional validation meant we weren't testing what we thought we were 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-04-11 17:34:35 -07:00
Aaron Lehmann
c18d03a778 Vendor distribution to correct config blob media type in schema2 manifest 
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in https://github.com/docker/distribution/pull/1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-04-11 17:29:17 -07:00
Riyaz Faizullabhoy
f7f8a961b5 Unit test for verifying invalid key ID 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-04-11 17:28:14 -07:00
Riyaz Faizullabhoy
7fe11bd102 Add key ID verification to Verify 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-04-11 17:26:08 -07:00
Richard Scothern
467fc068d8 Merge pull request #1622 from aaronlehmann/schema2-config-mediatype 
Use correct media type for config blob in schema2 manifest
 2016-04-11 17:23:03 -07:00
John Starks
c70f153f52 Windows: Support embedded utility VM images 
For TP5, the utility VM for Hyper-V containers is embedded in the base
layer's contents.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-11 17:16:17 -07:00
Aaron Lehmann
2de3f1a62a Use correct media type for config blob in schema2 manifest 
The schema2 manifest builder fills in this part of the manifest based on
the descriptor it gets back from BlobIngester's Put method. It passes
the correct media type to Put, but Put ends up replacing this value with
application/octet-stream in its return value.

This commit works around the issue in the manifest builder. Arguably Put
should not be changing the media type in its return value, but this
commit is a targeted fix to keep it very low-risk for possible inclusion
in Docker 1.11.

Fixes #1621 (but maybe we should open a separate issue for the media
type behavior in the distribution client, and the unnecessary stat).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-04-11 17:05:41 -07:00
Tianon Gravi
c082dad637 Add "VXLAN" to check-config.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-04-11 16:42:53 -07:00
Nathan LeClaire
d093888578 Bump Docker and Compose RC versions 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-11 16:40:28 -07:00
Nathan LeClaire
bcc976ac79 Merge pull request #3295 from nathanleclaire/swarm_no_hostnet 
Run Swarm containers without --net host
 2016-04-11 16:32:34 -07:00
Nathan LeClaire
618201c116 Run Swarm containers without --net host 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-11 16:23:00 -07:00
Nathan LeClaire
e1a07a342f Merge pull request #3294 from nathanleclaire/revert_stat_error 
Revert "Correct error handling for external SSH client"
 2016-04-11 15:57:25 -07:00
Ying Li
9c0e58c46e Stop using godep in CI and Makefile since we use vendoring now, and check for go version >= 1.6 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-04-11 15:40:53 -07:00
John Howard
b0e24c7393 Windows: Remove TP4 support from test code 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-04-11 15:36:31 -07:00
Nathan LeClaire
d1c9342c42 Merge pull request #3289 from mrbuk/master 
VMware Fusion: static ip addresses (dhcp) are evaluated
 2016-04-11 15:27:07 -07:00
Nathan LeClaire
f4d772f758 Revert "Correct error handling for external SSH client" 
This reverts commit f2acfa9492.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-11 15:19:43 -07:00
Nathan LeClaire
1766abc8c5 Merge pull request #3276 from tmds/master 
azure.md: extend documentation of command line options
 2016-04-11 15:15:11 -07:00
Nathan LeClaire
22a1044075 Merge pull request #3290 from mmalchuk/master 
Disable user-defined ssh_config configurations
 2016-04-11 15:14:23 -07:00
Alexander Morozov
2bcb6d694f Merge pull request #21941 from crosbymichael/copy-bins 
Improve source for containerd/runc copy
 2016-04-11 14:54:21 -07:00
David Lawrence
d3e0002740 Merge pull request #673 from cyli/fix-signer-tests 
Add the buildtags to go list ./... in the Makefile
 2016-04-11 14:50:57 -07:00
boynux
f6dd023b4e exited=0 in filter shouldn't show "Created" ones 
Newly created containers which are not started yet should not list
when "exited=0" filter is used with "ps -a"

Signed-off-by: Boynux <boynux@gmail.com>
 2016-04-11 23:44:05 +02:00
Ying Li
bc4e8a0f9e Change the HTTP server returned by signer config to be a pointer 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-04-11 14:31:41 -07:00
Ying Li
77b33cf10f Add the buildtags to go list ./... in the Makefile, signer should not be pkcs11 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-04-11 13:25:23 -07:00
John Starks
15b0f06a9a Windows: Revendor Microsoft/hcsshim 
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-04-11 13:23:38 -07:00
David Lawrence
22d46f847c Merge pull request #668 from cyli/simplify-client-update-retvalue 
NotaryRepository.Update now just returns an error, rather than a client and error
 2016-04-11 12:57:26 -07:00