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
Brian Goff
6fd8c96f61 Merge pull request #23344 from pdalpra/timeout-as-time.Duration 
Timeout as time.duration
 2016-06-08 16:37:08 -04:00
Sebastiaan van Stijn
70a03951a0 fix RPM spec for man8 
installation for man-8 was added in 1514b499f0
(pull-request 23236), but had a typo in a path,
causing generation of the RPM's to fail.

This fixes the path

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-08 22:21:21 +02:00
Jannick Fahlbusch
e3490cdcc0 Fix some typos 
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
 2016-06-08 21:59:34 +02:00
Richard Scothern
75882f079c Merge pull request #1774 from RichardScothern/catalog-clarifcation 
Clarify API documentation around catalog fetch behavior
 2016-06-08 12:59:09 -07:00
Ying Li
4ad17f6f2a Merge pull request #769 from gtank/go-devel 
allow devel builds of go to pass make version check
 2016-06-08 12:40:43 -07:00
Alexander Morozov
3b08711bb7 Merge pull request #23343 from vdemeester/migrate-build-to-cobra 
Use spf13/cobra for docker build
 2016-06-08 11:59:48 -07:00
George Tankersley
53d91279c6 allow devel builds of go to pass make version check 
Signed-off-by: George Tankersley <george.tankersley@gmail.com>
 2016-06-08 11:56:40 -07:00
Sebastiaan van Stijn
f8a8222126 Merge pull request #23381 from kolyshkin/docs-add-ploop-plugin 
docs/extend/plugins.md: add docker-volume-ploop
 2016-06-08 20:39:37 +02:00
Sebastiaan van Stijn
d11bfda738 Merge pull request #74 from thaJeztah/add-swarmkit 
Add SwarmKit
 2016-06-08 20:25:45 +02:00
Kirill Kolyshkin
e3d31d794b docs/extend/plugins.md: add docker-volume-ploop 
Added docker-volume-ploop driver to the list of available volume plugins.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2016-06-08 11:24:56 -07:00
Sebastiaan van Stijn
bf91ddcb58 Add SwarmKit 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-08 20:24:03 +02:00
Michael Crosby
393e97e435 Merge pull request #23002 from Microsoft/jjh/readonly 
Windows: Support RO volumes 14350+
 2016-06-08 11:18:48 -07:00
John Howard
9ea3f2aca2 Update win2lin scripts to match production 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-08 11:08:23 -07:00
Riyaz Faizullabhoy
a1f1fb449e Merge pull request #767 from docker/rethinkdb-export-schema 
Export rethinkdb table definitions
 2016-06-08 10:43:53 -07:00
Brian Goff
9db33b7646 Merge pull request #23377 from vdemeester/carry-pr-23007 
Carry #23007 :  Say something useful during docker load
 2016-06-08 13:42:22 -04:00
Richard Scothern
352924cd85 Clarify API documentation around catalog fetch behavior 
Signed-off-by: Richard Scothern <richard.scothern@docker.com>
 2016-06-08 10:39:17 -07:00
Richard Scothern
2cbf54df6c Merge pull request #1773 from zhouhaibing089/comment-fix 
Fix incorrect comment about auth type
 2016-06-08 10:31:49 -07:00
Richard Scothern
79102ecf85 Merge pull request #1772 from runcom/go1.6const 
registry: use const for status code 429
 2016-06-08 10:22:57 -07:00
Vincent Demeester
148bcda329 Merge pull request #23375 from HackToday/fixnetworkmap 
Fix wrong map usage
 2016-06-08 18:19:08 +02:00
Vincent Demeester
9b5e0ea7de Update docker-load documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-08 17:40:37 +02:00
Vincent Demeester
430950e2d1 Merge pull request #23305 from thaJeztah/fix-network-examples 
network docs cleanup
 2016-06-08 17:32:00 +02:00
Doug Davis
6986a3220f Say something useful during docker load 
During a `docker load` there are times when nothing is printed
to the screen, leaving the user with no idea whether something happened.
When something *is* printed, often its just something like:
```
1834950e52ce: Loading layer 1.311 MB/1.311 MB
5f70bf18a086: Loading layer 1.024 kB/1.024 kB
```
which isn't necessarily the same as the image IDs.

This PR will either show:
- all of the tags for the image, or
- all of the image IDs if there are no tags

Sample output:
```
$ docker load -i busybox.tar
Loaded image: busybox:latest

$ docker load -i a.tar
Loaded image ID: sha256:47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb
```

IOW, show the human-friendly stuff first and then only if there are no tags
default back to the image IDs, so they have something to work with.

For me this this is needed because I have lots of images and after a
recent `docker load` I had no idea what image I just imported and had a
hard time figuring it out.  This should fix that by telling the user
which images they just imported.

I'll add tests once there's agreement that we want this change.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-06-08 17:17:05 +02:00
Vincent Demeester
a63e95423a Merge pull request #23372 from GaretJax/23369-unicode-parse-words 
Support unicode characters in parseWords
 2016-06-08 17:05:02 +02:00
zhouhaibing089
fc9aa2f351 incorrect comment about auth type 
Signed-off-by: haibzhou <haibzhou@ebay.com>
 2016-06-08 22:47:45 +08:00
Kai Qiang Wu(Kennan)
1cac7e6cbd Fix wrong map usage 
As map reference, if all networks use same, it could cause strange
results.
Closes: #23304
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-06-08 14:36:47 +00:00
Jonathan Stoppani
6284f04a6b Support unicode characters in parseWords 
Signed-off-by: Jonathan Stoppani <jonathan.stoppani@divio.com>
 2016-06-08 14:05:08 +02:00
Vincent Demeester
a4422e6ebc Merge pull request #22880 from bfirsh/remote-api-json-errors 
Return remote API errors as JSON
 2016-06-08 11:16:00 +02:00
cyli
8ca6f99d5e Update the API docs about repo namespace to include the word 'owner' 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-06-08 01:46:19 -07:00
Antonio Murdaca
4901f1b278 registry: use const for status code 429 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-08 10:19:15 +02:00
Derek McGowan
23e5c94cfb Add separate overlay2 driver 
Adds a new overlay driver which uses multiple lower directories to create the union fs.
Additionally it uses symlinks and relative mount paths to allow a depth of 128 and stay within the mount page size limit.
Diffs and done directly over a single directory allowing diffs to be done efficiently and without the need fo the naive diff driver.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-08 00:16:01 -07:00
Derek McGowan
246e993031 Add more overlay tests and benchmarks 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-08 00:16:01 -07:00
Derek McGowan
8b0441d42c Expand graphtest package 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-08 00:16:01 -07:00
Allen Sun
79ee15fbb2 Merge pull request #2338 from NanXiao/issue-9999 
Edited docs/discovery.md
 2016-06-08 15:11:56 +08:00
NanXiao
a1c58f5149 Fix typos in docs/reference/manage.md and docs/reference/join.md 
Signed-off-by: NanXiao <nan@chinadtrace.org>
 2016-06-08 17:02:07 +08:00
Derek McGowan
8222c86360 Update archive package to support overlay whiteouts 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-08 00:10:16 -07:00
Viktor Stanchev
b03d3232d1 aufs compatibility 
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
 2016-06-08 00:10:16 -07:00
Pierre Dal-Pra
b29e8ea412 Use time.Duration for container restart/stop timeouts 
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
 2016-06-08 08:05:18 +02:00
Zhang Wei
04cdb8e602 Migrate stats and events command to cobra. 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-06-08 10:39:53 +08:00
Brian Goff
d85491ff4b Merge pull request #21946 from chosenken/add_disk_quota_to_zfs 
Add support for setting storage size on ZFS containers
 2016-06-07 22:18:25 -04:00
Arnaud Porterie
88e9fcf65a Merge pull request #23355 from crosbymichael/bump-containerd-jun7 
Update containerd to cf554d59dd96e459544748290eb91
 2016-06-08 02:14:05 +00:00
Ben Firshman
322e2a7d05 Return remote API errors as JSON 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-06-07 18:45:27 -07:00
Michael Crosby
d17b9f3da0 Update containerd to cf554d59dd96e459544748290eb91 
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-07 15:27:23 -07:00
Antonio Murdaca
f6ff9acc63 Merge pull request #23327 from dmcgowan/refactor-foreign-layer 
Refactor foreign sources to describable interfaces
 2016-06-08 00:02:23 +02:00
John Howard
8d174a43ba Windows: Support RO volumes 14350+ 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-07 14:55:36 -07:00
Vincent Demeester
13d101d53c Merge pull request #23333 from yongtang/23211-spf13-cobra-version 
Use spf13/cobra for docker version
 2016-06-07 23:46:01 +02:00
Joao Fernandes
0f5f18a213 Merge pull request #2309 from joaofnfernandes/upgrade 
Updates docs for upgrading with latest image
 2016-06-07 14:07:48 -07:00
Joao Fernandes
cdc8651ac3 Merge pull request #2311 from joaofnfernandes/fix-typo 
Fix docs typo. Replaces UCP with DTR
 2016-06-07 14:07:16 -07:00
Brian Goff
ce96ce9e05 Merge pull request #23311 from WeiZhang555/cobra-rm 
Migrate rm command to cobra
 2016-06-07 17:05:21 -04:00
Riyaz Faizullabhoy
8d72ff3f5e Add link to notary environment vars from docker trust automation section 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-06-07 14:03:56 -07:00
Brian Goff
c478a2739b Update cs-engine release notes for 1.11.2-cs3 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-06-07 16:57:44 -04:00