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
yuzou
cc82b0d48e In testsuites.go, enlarge the size of randomBytes to 128M to fix the crash of running TestConcurrentStreamReads
Signed-off-by: yuzou <zouyu7@huawei.com>
2016-01-15 17:22:43 +08:00
Jess Frazelle
4c89b1f72c Merge pull request #19355 from riyazdf/notary-revendor
notary revendor into docker
2016-01-15 01:02:35 -08:00
Antonio Murdaca
bca9415b52 Merge pull request #19356 from sanimej/restart
Vendoring libnetwork v0.5.6
2016-01-15 09:32:53 +01:00
Vincent Demeester
8ce8813cdc Merge pull request #18928 from wenchma/18626-add_subnets_info
Add Subnets info for user-defined network
2016-01-15 09:07:18 +01:00
David Gageot
ee5d3b3174 Merge pull request #2493 from nathanleclaire/ssh_help_additional_tests
Additional SSH tests
2016-01-15 08:44:59 +01:00
Riyaz Faizullabhoy
dd7436c832 revendor notary and wrap friendlier error messages
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-14 20:35:59 -08:00
Koichi Shiraishi
28b2fe9ce0 Fix docker daemon flag on systemd
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2016-01-15 13:05:56 +09:00
Sebastiaan van Stijn
c56ed85f3d Merge pull request #19353 from calavera/coolljt0725_is_a_maintainer
Add Lei Jitang to MAINTAINERS.
2016-01-14 19:37:33 -08:00
Aanand Prasad
a104e11191 Merge pull request #2659 from aanand/default-network-alias
Containers join each network aliased to their service's name
2016-01-15 03:30:07 +00:00
Daniel Nephin
dc1104649f Validate that an extended config file has the same version as the base.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 22:28:20 -05:00
David Calavera
8fc36b7f6b Add Lei Jitang to MAINTAINERS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 21:59:26 -05:00
Aanand Prasad
de6d6a42d7 Tag some more v2-dependent tests
Not clear why the config tests are v2-dependent; needs investigating

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:24 +00:00
Aanand Prasad
4772815491 Disable tests until Engine 1.10 change has been worked around
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:24 +00:00
Aanand Prasad
fbc275e06b Work around error message change in Engine
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:24 +00:00
Aanand Prasad
cba75627e1 Fix error when joining host/bridge network
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:24 +00:00
Aanand Prasad
ab2d18851f Test against a dev build of Engine 1.10
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:20 +00:00
Diogo Mónica
503a2cfe3c Merge pull request #460 from docker/fixing-migrations
Fixing initial.sql syntax
2016-01-14 18:19:45 -08:00
Diogo Monica
14b8bc8098 Fixing initial.sql syntax
Signed-off-by: Diogo Monica <diogo@docker.com>
2016-01-14 18:16:51 -08:00
Aanand Prasad
406b6b28f4 Tag v2-only tests
- Don't run them against Engine < 1.10
- Set the API version appropriately for the Engine version, so all tests
  use API version 1.22 against Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:08:20 +00:00
Aanand Prasad
abd031cb3d Containers join each network aliased to their service's name
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:08:20 +00:00
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-15 10:03:29 +08:00
Dongluo Chen
68d053113d Merge pull request #1641 from nishanttotla/fix-typos-release-checklist
Fixing typo in RELEASE-CHECKLIST.md
2016-01-14 17:38:35 -08:00
Nishant Totla
04781ef4c6 Fixing typo in RELEASE-CHECKLIST.md
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-14 17:32:55 -08:00
Nathan LeClaire
aa54a5f272 Add additional tests for SSH
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-14 17:27:41 -08:00
Nathan LeClaire
7246b2c965 Merge pull request #2833 from kunalkushwaha/multi-master
Configures swarm-master with failover support
2016-01-14 17:11:40 -08:00
Sebastiaan van Stijn
954613fb24 Merge pull request #19122 from ajneu/master
documentation: debian/ubuntu need apt-transport-https ca-certificates
2016-01-14 16:53:08 -08:00
Diogo Mónica
a7804cb280 Merge pull request #441 from docker/expose-old-version-err
Pass original invalid version storage error details into standardized err
2016-01-14 16:51:11 -08:00
Arnaud Porterie
6add477c91 Merge pull request #19308 from estesp/better-warning-msg
Better warning message on OOM kill disable without mem limit
2016-01-14 16:49:38 -08:00
Diogo Mónica
c6b8456b01 Merge pull request #457 from docker/error-messages-fix
Translate ErrMetaNotFound when updating, so long as it's on root, to ErrRepositoryNotExist
2016-01-14 16:48:53 -08:00
Sebastiaan van Stijn
e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file
Allow to set daemon and server configurations in a file.
2016-01-14 16:44:58 -08:00
Daniel Nephin
2a2eb81215 Merge pull request #2662 from dnephin/fix_config_printing_unicode
Fix config printing unicode objects
2016-01-14 19:26:39 -05:00
Tibor Vass
94b2d56690 Merge pull request #19109 from BrianBland/crossRepositoryPush
Cross repository push
2016-01-14 18:50:53 -05:00
Richard Scothern
7378e21678 Merge pull request #1332 from RichardScothern/gcs-params
Change the parameters to the GCS drivers to allow CircleCI testing.
2016-01-14 15:50:09 -08:00
Victor Vieux
b63b05aabb Merge pull request #1640 from vieux/bump-v1.1.0-rc1
Bump version to 1.1.0-rc1
2016-01-14 15:42:31 -08:00
Aanand Prasad
493df49d55 Merge pull request #2658 from dnephin/warn_on_caps
Error when the project name is invalid for the default image name
2016-01-14 23:41:04 +00:00
Daniel Nephin
1bfbba36b2 Ensure that the config output by config command never contains python objects.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:33:58 -05:00
Daniel Nephin
3021ee12fe Fix config command to print the new sections of the config
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:28:17 -05:00
Daniel Nephin
0f234154c2 Remove all non-external networks on down.
Also moves the shutdown test fixtures to be a more general v2-full fixture.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:28:17 -05:00
Ying Li
d4820c5756 Translate ErrMetaNotFound when updating, so long as it's on root, to ErrRepositoryNotExist.
Signed-off-by: Ying Li <ying.li@docker.com>
2016-01-14 15:27:11 -08:00
Daniel Nephin
b98e2169e6 Error when the project name is invalid for the image name.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:25:23 -05:00
Daniel Nephin
b689c4a218 Move service validation to validate_service().
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:25:22 -05:00
Stefan Scherer
6c88b8efea Add initial support building Windows docker in docker
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-15 00:20:50 +01:00
Joffrey F
796d97e394 Merge pull request #2617 from gutweiler/extra-hosts-ipv6
Extra hosts ipv6
2016-01-14 15:19:12 -08:00
Joffrey F
842dc14417 Merge pull request #2660 from albers/completion-down
bash completion for `docker-compose down`
2016-01-14 15:17:45 -08:00
Joffrey F
07c5103fe1 Merge pull request #2661 from albers/completion--abort-on-container-exit
bash completion for `docker-compose up --abort-on-container-exit`
2016-01-14 15:17:22 -08:00
Aanand Prasad
47e53b49c2 Merge pull request #2653 from shin-/Runscope-build-args
Support for build arguments
2016-01-14 23:13:54 +00:00
Ying Li
94c3c31f36 Merge pull request #453 from docker/fix-resign-root-on-publish
Ensure that we do not unnecessarily re-sign/serialize a root.json file on publish
2016-01-14 14:58:50 -08:00
Diogo Mónica
91bd1bff1d Merge pull request #456 from HuKeping/client
Improve client logging
2016-01-14 14:55:27 -08:00
Jess Frazelle
4bdb440cca Merge pull request #19332 from hypriot/update-arm-registry-notary
Update Dockerfile.armhf to sync changes for registry and notary
2016-01-14 14:54:12 -08:00
Sebastiaan van Stijn
9539c0a402 Merge pull request #18452 from moxiegirl/carrry-doc-17989
Update security docs for seccomp/apparmor
2016-01-14 14:42:37 -08:00