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
David Calavera
506fb9810c Merge pull request #21396 from aboch/vnn 
Vendoring libnetwork v0.7.0-dev.10
 2016-03-22 15:09:42 -07:00
Tibor Vass
8b8fcb796f Merge pull request #21303 from riyazdf/notary-vendor-docker1.11 
vendor notary for docker1.11
 2016-03-22 17:57:17 -04:00
Dongluo Chen
1d17bc6d37 Merge pull request #2004 from dongluochen/DuplicateNetworkEndpoints 
Skip redundant endpoints in "network inspect"
 2016-03-22 14:52:25 -07:00
David Lawrence
2e70ce0b3b Merge pull request #641 from docker/one-key-per-line 
Print one key and/or path per line when listing delegations
 2016-03-22 14:48:29 -07:00
David Calavera
2ec1764d45 Merge pull request #21400 from LK4D4/fix_volumes_race 
volume/local: fix race in List
 2016-03-22 14:29:12 -07:00
Dong Chen
0436dd1f26 An endpoint is duplicate/stale if its ID is part of endpoint index. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 14:10:57 -07:00
David Calavera
acaec7f67c Merge pull request #21385 from tonistiigi/load-parent-chain 
Add parent references support to load/save
 2016-03-22 14:07:06 -07:00
Alexander Morozov
14e1325656 daemon: log errors from stats calls 
I encountered silent errors ignoring when runc failed to parse pids.max

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-22 14:03:47 -07:00
Alexander Morozov
3eb0a80f29 builder: synchronize stderr and stdout 
it's concurrent streams and should be synchronized before writing to response.
Otherwise there will be race in writing to *bufio.Writer in
net/http.response.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-22 13:57:29 -07:00
Tonis Tiigi
14dc4a7158 Expose RootFS in image inspect 
Fixes #20451

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-22 13:49:30 -07:00
Alessandro Boch
fbdb3c3a4b Vendoring libnetwork v0.7.0-dev.10 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-22 12:36:21 -07:00
Michael Crosby
aca7e73a69 Copy containerd binaries in tgz 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-22 12:23:17 -07:00
Nathan LeClaire
bc89bf5e8d Prevent /var/lib/boot2docker/bootlocal.sh munging on restart 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-03-22 12:22:15 -07:00
Tibor Vass
53d2e5e9d7 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
 2016-03-22 15:12:33 -04:00
Michael Crosby
78568f2eb5 Add function for copy containerd 
This adds a function for copying containerd and other binaries as well
as adding a hash for those files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-22 12:06:56 -07:00
Joffrey F
2cc87555cb tls_config_from_options unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:57:45 -07:00
Nathan LeClaire
137adfe306 Merge pull request #3214 from exoscale/feature/update-egoscale 
exoscale: support for CoreOS
 2016-03-22 11:49:39 -07:00
Nathan LeClaire
cec812ae2f Merge pull request #3215 from sivel/rackspace-active-timeout 
Add --rackspace-active-timeout argument to rackspace driver
 2016-03-22 11:49:21 -07:00
Nathan LeClaire
c390ecd730 Merge pull request #3218 from dgageot/simple-appveyor 
Simplify appveyor config
 2016-03-22 11:48:40 -07:00
Joffrey F
4727115317 Bump docker-py version to include tcp host fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
442dff72b4 Improve assert_hostname setting in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
26f3861791 Specifying --tls no longer overrides all other TLS options 
Add an option to skip hostname verification

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
7166408d2a Fixed typos + simplified TLSConfig creation process. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
1ac33ea7e5 Add support for TLS config command-line options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
David Calavera
62d4556654 Merge pull request #21383 from estesp/shared-userns-net-ipc 
Allow net and IPC namespaces to be shared when userns=on
 2016-03-22 11:40:12 -07:00
Victor Vieux
7e1bcc36e5 Merge pull request #2006 from p8952/master-to-manager 
Change "master" to "manager"
 2016-03-22 11:37:30 -07:00
Riyaz Faizullabhoy
ab3772f72f vendor notary for docker1.11 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 11:28:19 -07:00
Alexander Morozov
3536c09cea volume/local: fix race in List 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-22 11:21:38 -07:00
David Lawrence
151b72c990 Merge pull request #645 from docker/delegation-password-env 
Delegation password environment var
 2016-03-22 11:20:11 -07:00
Olivier Gambier
d1444b56e9 Fix GCS 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2016-03-22 10:50:52 -07:00
Peter Wilmott
4b0b029ce2 Change "master" to "manager" 
The Docker Swarm documentation states that:

"Some documentation still refers to a primary manager as a “master”, but
that term has been superseded."

This change attempts to remove remaining references to "master" in order
to keep documentation consistent.

Signed-off-by: Peter Wilmott <p@p8952.info>
 2016-03-22 17:50:00 +00:00
Olivier Gambier
59401e277b Dependency validation enforce 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2016-03-22 10:45:50 -07:00
Olivier Gambier
53e3c1d7b2 Fix godeps 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2016-03-22 10:45:50 -07:00
Olivier Gambier
77e69b9cf3 Move to vendor 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2016-03-22 10:45:49 -07:00
Tibor Vass
de9ff4bdc0 Merge pull request #21223 from cpuguy83/add_nocp_to_vols 
Add explicit flags for volume cp/no-cp
 2016-03-22 13:45:12 -04:00
Ken Cochrane
5e3a8ef887 Updated release.sh script to stop uploading binaries 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-03-22 13:42:54 -04:00
Michael Crosby
0dcdd1c5b8 Merge pull request #21341 from duglin/tweakBuild 
Add containerd/runc exes to bundle dir after build
 2016-03-22 10:29:56 -07:00
Riyaz Faizullabhoy
a5dede1c2f Update docs with delegation env var 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 10:21:15 -07:00
Dong Chen
d045bd44e0 Skip redundant endpoints in "network inspect" 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 10:19:22 -07:00
Riyaz Faizullabhoy
d1dbc3dbd4 Add delegation passphrase env var 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 10:09:38 -07:00
Vincent Demeester
e8774fbb9f Merge pull request #21366 from martinmosegaard/master 
Fix plural typo in 'save' command help
 2016-03-22 17:26:32 +01:00
Evan Hazlett
fc214b4408 add label support for build, networks and volumes 
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-03-22 11:49:06 -04:00
Brian Goff
563d0711f8 Move layer mount refcounts to mountedLayer 
Instead of implementing refcounts at each graphdriver, implement this in
the layer package which is what the engine actually interacts with now.
This means interacting directly with the graphdriver is no longer
explicitly safe with regard to Get/Put calls being refcounted.

In addition, with the containerd, layers may still be mounted after
a daemon restart since we will no longer explicitly kill containers when
we shutdown or startup engine.
Because of this ref counts would need to be repopulated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-22 11:36:28 -04:00
Aanand Prasad
4f5123bda9 Merge pull request #3168 from dnephin/fix_tty_timeout 
Handle all timeout errors consistently
 2016-03-22 10:14:52 +00:00
Aanand Prasad
aaa7b09369 Merge pull request #3181 from dnephin/fix_partial_change_test_failure 
Fix flaky partial_change state test
 2016-03-22 10:14:28 +00:00
Aanand Prasad
a20b84e6d2 Merge pull request #3178 from aanand/2774-off-one-offs 
Remove one-off containers in `rm` and `down`
 2016-03-22 10:12:21 +00:00
Sebastiaan van Stijn
7720338713 Merge pull request #21388 from zhuguihua/move_zfs_options_to_correct_place_in_man_page 
Move ZFS options to correct place in man page
 2016-03-22 08:26:54 +01:00
Vincent Bernat
05aea83271 exoscale: add support for CoreOS 
The egoscale binding for exoscale was limiting the images that could be
selected by a user to Ubuntu one only. Enable the use of arbitrary
images. For example, the following images are now available:

 - centos-6.6
 - centos-7.1
 - coreos-stable-835
 - debian-7
 - debian-8
 - ubuntu-12.04
 - ubuntu-14.04
 - ubuntu-15.10

The default user for non-Ubuntu images are not "ubuntu". Let the user
choose the appropriate user ("core" for CoreOS and "debian" for Debian).

CoreOS user are likely to want the ability to provide custom user data
as it enables the configuration of the etcd cluster. We add an option to
provide custom user data file. Moreover, we remove some of the default
options as they are not supported in CoreOS and are useless on
Debian/Ubuntu:

 - Resizing of rootfs is already done on all images by default.
 - Docker Machine will set the hostname as part of the provisioning.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2016-03-22 08:20:35 +01:00
Martin Mosegaard Amdisen
5a701c3e4c Update 'save' command help 
Based on review feedback.

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
 2016-03-22 08:16:52 +01:00
Zhu Guihua
df6def3c0c Move ZFS options to correct place in man page 
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
 2016-03-22 14:50:49 +08:00