f6f7d35248
Restore the stripped registry version number
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-05-27 15:15:47 -07:00
c19962ade1
Allow mirroring only for the official index
...
Strip authconfig from session to keep credentials from being sent to the mirror.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-05-26 11:08:19 -07:00
13deed3801
Registry v2 mirror support.
...
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.
See docker/distribution#459 for details
Configuration
Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.
Pull
If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.
Push
If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-05-26 11:08:19 -07:00
fc679bebb9
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
2015-05-26 10:49:48 -07:00
7853bd29ec
Merge pull request #13480 from Microsoft/10662-fixvolumecompile
...
Windows: Fix volume_windows compile
2015-05-26 10:32:44 -07:00
1dc0499b64
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-26 09:43:21 -07:00
5d207de509
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-26 09:33:55 -07:00
0fccc40307
Merge pull request #13471 from ibuildthecloud/no-nil
...
Preinitialize MountPoints to avoid assigning to a nil map
2015-05-26 12:26:49 -04:00
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
59214a0737
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-05-25 19:37:57 -07:00
628c396555
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
2015-05-25 14:32:17 -04:00
7d75c5be95
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-05-25 13:39:56 -04:00
8efd87f5a2
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
2015-05-25 19:26:19 +02:00
187362414d
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
2015-05-25 19:15:47 +02:00
453c0abf1c
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org >
2015-05-25 09:43:25 -07:00
c12081987a
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
2015-05-25 18:32:15 +02:00
5f57143b31
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
2015-05-25 18:07:19 +02:00
5051aee555
small formatting and grammar fixes
...
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.
The other two changes are just small grammar improvements.
Signed-off-by: don <donkirkby@gmail.com >
2015-05-25 09:05:42 -07:00
e2ed11df13
Merge pull request #13445 from lloydde/doc-cli-no-head
...
doc: cli images examples rm "| head".
2015-05-25 17:32:13 +02:00
02405a96b2
Markdown changes (thanks to runcom for the rebase+squash handholding)
...
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com >
2015-05-25 17:24:41 +02:00
08da08f3f9
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-25 07:39:27 -07:00
fd28f15288
Merge pull request #13452 from WeiZhang555/cleanup
...
Cleanup: change test func name
2015-05-25 13:11:31 +02:00
ab121345ee
Cleanup: change test func name
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-25 14:51:10 +08:00
ca23ac37ef
doc: cli images examples rm "| head".
...
It's a given that lines of example output might be truncated or come
from a contrived environment.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
2015-05-24 14:04:13 -07:00
f83073d3eb
Merge pull request #13424 from mavenugo/vendorin
...
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
2015-05-23 21:08:58 -07:00
bce3e761c0
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
2015-05-23 18:44:18 -07:00
a3d22c764c
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-05-23 18:42:34 -07:00
2e2e36e476
Merge pull request #13427 from moxiegirl/event-state-12164
...
Finally, finally, close #12164
2015-05-23 15:37:57 -07:00
6de4138465
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-23 14:27:50 -07:00
89582f9781
Merge pull request #13403 from hqhq/hq_fix_ipcmode_check
...
Don't check running container at create time
2015-05-23 08:32:51 -07:00
8d0486832d
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
2015-05-22 17:00:04 -07:00
ab8a5bcf04
Move Documentation changes out or this PR.
...
The will come in a follow up PR inside the experimental section.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-22 16:58:48 -07:00
d592778f4a
Propagate unmount events to the external volume drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-22 16:43:34 -07:00
84aae5a226
Don't check running container at create time
...
We should let user create container even if the container he wants
join is not running, that check should be done at start time.
In this case, the running check is done by getIpcContainer() when
we start container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-23 07:15:14 +08:00
4bcfa47362
Merge pull request #13414 from tiborvass/no-distrib-in-dockerfile
...
Remove distribution source code from /go/src
2015-05-22 15:11:36 -07:00
2b0b0c4b97
Remove distribution source code from /go/src
...
We already vendor distribution under ./vendor, but
because the GOPATH is /go:/go/src/github.com/.../vendor
Go will always compile the source code at /go not in ./vendor.
Apart from the fact that it is very inconvenient during
development, it was also a time-bomb: someone vendors a fix
from upstream distribution, but forgets to update
REGISTRY_COMMIT in the Dockerfile, and the binary doesn't get
the fix.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-22 16:50:56 -04:00
f2c0b54315
Merge pull request #13408 from jfrazelle/13407-fix-experimental-build
...
lol 108 chars ETOOMANY
2015-05-22 10:42:57 -07:00
ed9ad0be6d
Merge pull request #13391 from jfrazelle/add-security-maintainers
...
Add diogo and nathan as security maintainers.
2015-05-22 10:12:04 -07:00
a1ea562b20
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-22 10:10:17 -07:00
d71ba0cc83
Merge pull request #13372 from calavera/move_socket_creation_to_package
...
Extract sockets initialization to a package.
2015-05-22 08:46:31 -07:00
8e76c0d1d8
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
2015-05-22 08:42:57 -07:00
0775456b46
Merge pull request #13401 from WeiZhang555/cleanup
...
Delete "defer deleteAllContainers()" from integration-cli
2015-05-22 09:17:23 -04:00
6809fa6861
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-22 17:01:52 +08:00
a867c1b70a
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
3bf0ca31cf
Allow named volumes for external drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
2653c7c16c
Make API volume-driver dependent on 'experimental'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 20:34:17 -07:00
4fc37a1ede
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 20:34:17 -07:00
7da5a7eb66
Disable -v overloading
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
2015-05-21 20:34:17 -07:00
81fa9feb0c
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
23e8dff9e7
Merge pull request #13399 from hqhq/hq_fix_run_test
...
Fix test failure when --net none build
2015-05-21 21:50:44 -04:00
Richard