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
Steve Durrheimer
8a51f9511c Add zsh completion for 'docker network ls -f {id,name,type}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-29 22:38:10 +02:00
Doug Davis
aa537a367c Merge pull request #22417 from michael-holzheu/s390x-dockerfile-add-registry-and-notary
Dockerfile.s390x: Build correct registries and notary client
2016-04-29 13:59:14 -04:00
John Howard
f114ab21de Merge pull request #22340 from Microsoft/jstarks/split-service
Windows: Support running dockerd as a service
2016-04-29 10:47:20 -07:00
Vincent Demeester
9a58dd22f0 Merge pull request #22419 from cpuguy83/reflection_is_for_mirrors
Remove reflection on CLI init
2016-04-29 19:42:19 +02:00
Michael Holzheu
6e4c87c06e Dockerfile.s390x: Build correct registries and notary client
Sync with other Dockerfiles:

 1) Adjust REGISTRY_COMMIT
 2) Add old shema1 registry
 3) Install notary client

This fixes the following testcases:

 DockerSchema1RegistrySuite:
  - SetUpTest
 DockerTrustSuite:
  - TestTrustedBuildTagFromReleasesRole
  - TestTrustedBuildTagIgnoresOtherDelegationRoles
  - TestTrustedPullReadsFromReleasesRole
  - TestTrustedPullIgnoresOtherDelegationRoles
  - TestTrustedPushWithReleasesDelegationOnly
  - TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor
  - TestTrustedPushSignsForRolesWithKeysAndValidPaths
  - TestTrustedPushDoesntSignTargetsIfDelegationsExist
 DockerRegistrySuite:
  - TestPullManifestList
  - TestCrossRepositoryLayerPush
 DockerHubPullSuite:
  - TestPullAllTagsFromCentralRegistry

v2: Sync comments on all architectures

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-04-29 19:24:49 +02:00
Derek McGowan
72c9bfe1b5 Merge pull request #1683 from dmcgowan/update-golem-test-versions
Use official docker 1.11.1 image to test docker 1.11
2016-04-29 09:54:28 -07:00
Riyaz Faizullabhoy
35010659eb Merge pull request #695 from docker/size-const
Add const for max size -1 for GetMeta
2016-04-29 09:53:10 -07:00
Ying Li
f2f9e6169a Add a codecov config file that disables project and changes statuses
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-29 09:42:29 -07:00
Riyaz Faizullabhoy
7e6c15d7e1 Rename constant
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-29 09:33:45 -07:00
Riyaz Faizullabhoy
fa1ead35e2 More occurrences of -1 and fixup comments
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-29 09:32:10 -07:00
Riyaz Faizullabhoy
4bd5c10fc8 Add const for max size -1 for GetMeta
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-29 09:31:02 -07:00
Brian Goff
5c8950e84d Remove reflection on CLI init
before:
```
$ time docker --help
real  0m0.177s
user  0m0.000s
sys 0m0.040s
```

after:
```
$ time docker --help
real  0m0.010s
user  0m0.000s
sys 0m0.000s
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-29 11:57:46 -04:00
Sebastiaan van Stijn
55bc0a3440 Merge pull request #22418 from thaJeztah/update-event-api-docs
update API example response for docker events
2016-04-29 17:53:16 +02:00
Sebastiaan van Stijn
3932d46a78 update API example response for docker events
the events API was rewritten in 723be0a332,
but the example response in the documentation doesn't reflect the actual output

this fixes the example response

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-29 17:37:04 +02:00
allencloud
1ac4c61c10 fix typos in CHANGELOG.md and pull.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-29 23:33:15 +08:00
Lucas Chan
55d61e98ba Updated docker-info output and documentation
- [x] Update man page description
- [x] Update man page sample output to something more current

Tested with: `TESTFLAGS='-check.f DockerSuite.TestInfoEnsureSucceeds*'
make test-integration-cli`

Signed-off-by: Lucas Chan <lucas-github@lucaschan.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-29 16:45:43 +02:00
Sebastiaan van Stijn
23e418b6c9 Add "driver" filter for network ls
This add a new filter to 'docker network ls'
to allow filtering by driver-name.

Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-29 16:22:26 +02:00
Brian Goff
2b6bc294fc When calling volume driver Mount, send opaque ID
This generates an ID string for calls to Mount/Unmount, allowing drivers
to differentiate between two callers of `Mount` and `Unmount`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-29 09:37:02 -04:00
Doug Davis
24a8de2b60 Merge pull request #22202 from michael-holzheu/s390x-add-libseccomp-2.3.0
Dockerfile.s390x: Add upstream libseccomp to compile runc
2016-04-29 08:13:13 -04:00
Alexandre Beslic
dd90e08024 Merge pull request #2176 from allencloud/close-http-response-body-to-avoid-memory-leak
close http response body to avoid potential memory leak
2016-04-28 18:23:25 -07:00
Wen Cheng Ma
24ec73f754 Update the docker daemon to dockerd for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-04-29 09:06:02 +08:00
Ying Li
c2219d664e Merge pull request #705 from docker/docs-fix
Docs fix
2016-04-28 18:00:59 -07:00
Victor Vieux
9dd298589d Merge pull request #2177 from jimmyxian/add-support-ps-filter-volume
add support ps --filter volume
2016-04-28 17:59:44 -07:00
drew ogryzek
d2c9f8bc9a Update Edits
Signed-off-by: drew ogryzek <drew@drewbro.com>
2016-04-28 16:23:39 -07:00
drew ogryzek
354a71b4cf Edit typos in 'Try Swarm at scale'
Signed-off-by: drew ogryzek <drew@drewbro.com>
2016-04-28 16:23:39 -07:00
Derek McGowan
8cded9db0d Use official docker 1.11.1 image to test docker 1.11
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-04-28 14:51:13 -07:00
Viktor Stanchev
81bd90aae0 Merge pull request #1850 from vikstrous/docs_stuff
docs stuff; fix #1833; fix #1691; fix #1692; fix #1690; fix #1693; fi…
2016-04-28 14:27:01 -07:00
André R
84aa39e978 Clarify env-file doc that .env is read from cwd
Closes #3381

Signed-off-by: André R <ar@ez.no>
2016-04-28 23:14:06 +02:00
Richard Scothern
ba927007b0 Merge pull request #1677 from RichardScothern/tonyhb-fix-s3-gc-error
Move GC into storage package and add tests
2016-04-28 14:09:58 -07:00
Brian Goff
717842fbde Merge pull request #22370 from mlaventure/fix-experimental-builder
Allow specifying the apt mirror to use when generating deb packages
2016-04-28 16:26:29 -04:00
Ying Li
177711137f Fix service architecture tables that were misformatted, and re-link sequence diagram.
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-28 13:19:03 -07:00
Ying Li
27469f01fe Fix metadata sequence diagram that was missing arrows.
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-28 13:18:24 -07:00
Kenfe-Mickael Laventure
d0a65a03e9 Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-28 13:05:34 -07:00
Joffrey F
8cc7d68a00 Merge pull request #3390 from aronahl/master
Add missing log event filter when using docker-compose logs.
2016-04-28 12:53:04 -07:00
Joffrey F
0b24883cef Support combination of shorthand flag and equal sign for host option
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 12:52:00 -07:00
Nathan LeClaire
ae9f392c10 Merge pull request #3365 from ndeloof/master
Fixes #2302 Possibility to create master with manager, but without agent
2016-04-28 12:12:51 -07:00
Aaron Lehmann
620a030217 Preserve author information in schema1 manifests
When we push a schema1 manifest, we encode history information from the
image JSON into v1Compatibility strings for the respective layers. The
"author" field was not being set in these v1Compatibility strings, so if
a parent layer had an author set, it would not be preserved after
pushing through a schema1 manifest and repulling, so the image ID would
change after the pull. This change preserves the authorship information
for parent layers so that the image ID does not change.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-04-28 11:57:48 -07:00
Nicolas De Loof
8ed715fd4f Fixes #2302 Possibility to create master with manager, but without agent
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2016-04-28 20:16:56 +02:00
Ying Li
2166f84543 Merge pull request #704 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-04-28 10:56:56 -07:00
Nathan LeClaire
0a5abf22b6 Merge pull request #3393 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-04-28 10:55:50 -07:00
Nathan LeClaire
25c3fa64a4 Merge pull request #3387 from ndeloof/fix-3287
Introduce —swarm-join-opt to pass options to agent nodes Fixes #3285 Fix regression introduced by PR #3287
2016-04-28 10:54:12 -07:00
Riyaz Faizullabhoy
b54934f353 Merge pull request #703 from SvenDowideit/fix-image-path
Use markdown to link to image, so the published result shows it
2016-04-28 09:11:28 -07:00
Brian Goff
ca611fdea2 Merge pull request #22388 from fy2462/exec-add-newline
Fix bug: exec non-exist command miss a "\n"
2016-04-28 11:30:28 -04:00
Aaron Nall
2efcec776c Add missing log event filter when using docker-compose logs.
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2016-04-28 15:14:44 +00:00
Brian Goff
dbee44c9e0 Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
Support unixgram syslog address
2016-04-28 11:06:17 -04:00
Daniel Nephin
61794ba97c Merge pull request #3377 from shin-/3372-windowserror
Define WindowsError on non-win32 platforms
2016-04-28 10:33:18 -04:00
Sebastiaan van Stijn
0bb4c902e0 Merge pull request #22396 from sbellem/docs-typo-fix
Fix typo
2016-04-28 15:27:28 +02:00
Sven Dowideit
0b7bc1c04d convert docs Dockerfiles to use docs/base:oss
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 13:22:41 +00:00
Sylvain Bellemare
63aa03ce0a Fix typo
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
2016-04-28 15:15:08 +02:00
Sven Dowideit
4848aeaa1f convert docs Dockerfiles to use docs/base:oss
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 13:13:51 +00:00