1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Aanand Prasad
6064d200f9 Fix output of 'config' for v1 files
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
Aanand Prasad
84a3e2fe79 Check full error message in test_up_with_net_is_invalid
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
Aanand Prasad
a4d3dd6197 Remove v2_only decorators on config tests
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
Alexandre Beslic
258e9d6752 Merge pull request #2173 from vieux/fix_tests
fix swarm build in tests
2016-04-26 11:19:52 -07:00
Madhu Venugopal
95229513b3 Updating CS-Engine release notes for 1.10.3-cs2 and 1.10.3-cs3
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-04-26 11:17:27 -07:00
Victor Vieux
ef7e2777a8 fix swarm build in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-26 11:16:37 -07:00
Aaron Lehmann
8e30157a5c trustmanager: Minor cosmetic source code fixes
Fixing a few things I noticed scrolling through the Notary 0.3.0-RC1
diff.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-04-26 10:29:39 -07:00
Sun Hongliang
4d9e8dc42d return immediately when getting an httpError to avoid response mixture
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 01:00:10 +08:00
Sebastiaan van Stijn
1f72e46095 Merge pull request #22291 from thaJeztah/update-template-for-changelog
pull-request template: ask for changelog description
2016-04-26 18:51:31 +02:00
Joffrey F
0cd35913c3 Merge pull request #3382 from dnephin/upgrade_pip
Upgade pip to latest - attempt to fix jenkins builds
2016-04-26 09:38:12 -07:00
John Howard
0c7eab3157 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
Daniel Nephin
26fe8213aa Upgade pip to latest
Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-26 11:58:41 -04:00
Vincent Demeester
dc7664d62e Merge pull request #22308 from tianon/dockerd-consistency
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
Ken Cochrane
f1ad6f127b Exclude .git directories from the source RPMS
Ignore .git directory when creating debian sources

Added missing DOCKER_GITCOMMIT env variable to build-deb

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-26 09:26:32 -04:00
Zhang Wei
a7eecd2b61 Fix test case
"TestRestartContainerwithRestartPolicy" contains some codes that could be
flaky, it's supposed to be fixed in #22256.

This commit removes unnecessary code, make the test case cleaner.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-26 19:22:48 +08:00
Vincent Demeester
6b91fd1a91 Merge pull request #22328 from HackToday/fixcomment
Fix wrong comment
2016-04-26 13:00:38 +02:00
Sebastiaan van Stijn
3f7b6754ca Merge pull request #22331 from SvenDowideit/minor-api-formating-change
Small API formating fix.
2016-04-26 12:46:25 +02:00
Sven Dowideit
204a52c689 Small API formating fix.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-26 10:29:31 +00:00
Sebastiaan van Stijn
eb59238d17 pull-request template: ask for changelog description
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-26 12:26:14 +02:00
Antonio Murdaca
6a8ea46c67 daemon: reorder mounts before setting them
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-04-26 11:03:25 +02:00
Kai Qiang Wu(Kennan)
718eba8836 Fix wrong comment
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-26 07:36:14 +00:00
Sebastiaan van Stijn
57a5b1dbef Merge pull request #61 from thaJeztah/update-maintainers
update maintainers-file
2016-04-26 09:27:52 +02:00
Vincent Demeester
dc98cb534e Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
Windows: revendor Azure/go-ansiterm
2016-04-26 08:19:47 +02:00
John Howard
78895c92c2 Merge pull request #22275 from Microsoft/jstarks/no_rsrc
Windows: Add file version information
2016-04-25 20:53:19 -07:00
Ke Xu
24103260a3 #3191 add zsh completion
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-04-26 11:51:40 +09:00
Richard Scothern
47d14555c0 Merge pull request #1644 from fh1ch/clarify-kid-format
Clarify kid format for JWT token auth in docs
2016-04-25 17:01:15 -07:00
Brian Goff
e2c40555f7 Merge pull request #22318 from mrunalp/mount_label_fix
Fix mount label
2016-04-25 19:54:32 -04:00
Richard Scothern
d654cfd985 Merge pull request #1623 from dmcgowan/docker-integration-readme
Integration test readme update
2016-04-25 16:10:19 -07:00
Richard Scothern
c83afea0c9 Merge pull request #1660 from jhaohai/cn-north-1-fix
Add cn-north-1 to valid check
2016-04-25 16:07:54 -07:00
Richard Scothern
ef32134592 Merge pull request #1666 from sergeyfd/master
Add blobWrtiter.Close() call into blobWriter.Commit()
2016-04-25 16:02:48 -07:00
Richard Scothern
96f796fb01 Merge pull request #1670 from vadmeste/fix_parts_sorting
s3 driver: Sorting completed parts by part number for a better accordance with S3 spec
2016-04-25 16:02:17 -07:00
John Starks
fab67ab677 Windows: revendor Azure/go-ansiterm
go-ansiterm was previously pulling the testing package into the docker
binaries.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-25 15:57:59 -07:00
John Howard
66ebc34235 Merge pull request #22055 from Microsoft/sjw/servicing
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 15:20:23 -07:00
Nathan LeClaire
af4f3828f6 Merge pull request #3370 from kacole2/documentation/add_rackhd_driver_plugin_to_list
Added RackHD to the Available Driver Plugin List & Alphabetized
2016-04-25 14:49:09 -07:00
Sebastiaan van Stijn
ca392db248 update maintainers-file
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-25 23:31:36 +02:00
Mrunal Patel
e0f98c698b Update runc and spec dependencies for mount label
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-25 14:26:49 -07:00
Sebastiaan van Stijn
00e84ca4d2 docs: remove duplicate line in "Understand the architecture"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-25 23:16:49 +02:00
Alexander Morozov
1b4286f40d Merge pull request #22306 from thaJeztah/update-integration-test-network-only
skip TestAuthApi if no network is available
2016-04-25 14:02:26 -07:00
Nishant Totla
6998163ab1 Change context.TODO() to context.Background()
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-25 13:59:21 -07:00
Kendrick Coleman
58122bab64 Added RackHD to the Available Driver Plugin List & Alphabetized
Added RackHD to the list of available driver plugins. Also alphabetized the list to make it easier to read.

Signed-off-by: Kendrick Coleman <kendrickcoleman@gmail.com>
2016-04-25 16:58:13 -04:00
Victor Vieux
e19990d2f5 Merge pull request #2164 from vieux/rollback_to_1.5.4
rollback to Go 1.5.4
2016-04-25 13:57:53 -07:00
Darren Stahl
8df2066341 Add IO Resource Controls for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-04-25 13:07:29 -07:00
Nathan LeClaire
6839107ecc Merge pull request #3287 from LBaali/3285
Add support for --swarm-opt to agent nodes
2016-04-25 12:24:00 -07:00
Stefan J. Wernli
da92dad59f Adding servicing update to postRunProcessing for Windows containers.
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-25 12:16:26 -07:00
Brett Higgins
207027087e Respect ALL_PROXY during registry operations
Use sockets.DialerFromEnvironment, as is done in other places,
to transparently support SOCKS proxy config from ALL_PROXY
environment variable.

Requires the *engine* have the ALL_PROXY env var set, which
doesn't seem ideal. Maybe it should be a CLI option somehow?

Only tested with push and a v2 registry so far. I'm happy to look
further into testing more broadly, but I wanted to get feedback on
the general idea first.

Signed-off-by: Brett Higgins <brhiggins@arbor.net>
2016-04-25 15:08:30 -04:00
Andrew Hsu
c4df027d41 modify redirect test to include port
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-25 11:52:46 -07:00
Andrew Hsu
fe9509f8f3 added config doc for redirect middleware
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-25 11:52:39 -07:00
Andrew Hsu
80248c3d3a scheme and host mandatory in baseurl
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-25 11:52:25 -07:00
Andrew Hsu
059bc5f5ef separate the go/non-go imports and reorder
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-25 11:52:03 -07:00
Nathan LeClaire
4e898b1806 Merge pull request #3362 from nathanleclaire/fix_dangling_amazonec2_ssh_key
Ensure that attempt to remove instance and SSH key both go through
2016-04-25 11:48:35 -07:00