1
0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Arnaud Porterie
261af00282 Merge pull request #13682 from mavenugo/ln_vin
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
2015-06-13 09:00:33 -07:00
Doug Davis
f1ea3e5c74 Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig
Refactor verifyHostConfig: change to verifyConfigs and add verify config
2015-06-12 19:59:45 -07:00
Victor Vieux
174ea0c4d7 Merge pull request #941 from aluzzardi/events-panic
Engine: fix panic in disconnect with events.
2015-06-12 19:01:28 -07:00
Andrea Luzzardi
1e548c4a80 update dockerclient
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi
4265d07669 update samalba/dockerclient
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Andrea Luzzardi
82fc920e90 Engine: fix panic in disconnect with events.
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:51:05 -07:00
Victor Vieux
3a87ddcc53 Merge pull request #944 from aluzzardi/leadership-test-fix
Leadership: Remove flaky test.
2015-06-12 18:50:52 -07:00
Andrea Luzzardi
6ce921fde7 Leadership: Remove flaky test.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 18:48:53 -07:00
Andrea Luzzardi
e0f2da36b2 Merge pull request #943 from vieux/update_travis
update travis go vet go cover
2015-06-12 18:42:35 -07:00
Victor Vieux
0b71190508 update travis go vet go cover
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 18:35:05 -07:00
Lei Jitang
b37832e353 Add verify config to verifyContainerSettings
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-06-13 09:31:19 +08:00
Arnaud Porterie
422fa7f0a6 Merge pull request #13749 from Microsoft/adduseragent
Add GOOS in User-Agent
2015-06-12 17:19:51 -07:00
Michael Crosby
39bf57e085 Merge pull request #13344 from hqhq/hq_fix_arm64_test
Fix unit-test build error on ARM64
2015-06-12 17:11:18 -07:00
Arnaud Porterie
6a7a7570bb Merge pull request #12833 from burke/faster-changes
Optimize archive.ChangesDirs on Linux
2015-06-12 17:05:34 -07:00
Madhu Venugopal
083300168f Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-12 16:10:40 -07:00
Victor Vieux
53e88f3712 Merge pull request #933 from vieux/support_1.6.x+
Support 1.6.0+
2015-06-12 15:58:52 -07:00
Jeffrey Morgan
5628e91d7c Merge branch 'master' into windows
Conflicts:
	src/components/ContainerSettingsPorts.react.js
	src/components/ContainerSettingsVolumes.react.js
2015-06-12 15:48:29 -07:00
Jessie Frazelle
cd71c5ed43 Merge pull request #13836 from amylindburg/master
Update plugins.md
2015-06-12 15:40:20 -07:00
Sean Li
35ab1976b6 Fixed username not looking nice for shorter names. 2015-06-12 15:38:47 -07:00
Amy Lindburg
0a529b6e7a Update plugins.md
Fixed broken link.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins.md

Some other broken links!

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugin_api.md

FIxing broken links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins_volume.md

Fixing more links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
2015-06-12 15:38:15 -07:00
Jeffrey Morgan
97e0b74d6d Merge pull request #630 from kitematic/fix-username-overflow
Fixed long username and adjusted verify account layout.
2015-06-12 15:34:56 -07:00
David Lawrence
13c4d05b79 bugfixing so it builds with new gotuf repo. Need to work out what I'm going with CanSign method, might get rid of it and just inspect error response 2015-06-12 15:00:36 -07:00
Alexandre Beslic
8c39e16ddb Merge pull request #938 from aluzzardi/leadership-status
Replication Status
2015-06-12 14:33:40 -07:00
Andrea Luzzardi
2b9165b2f2 leadership: Fix data races in tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 14:18:37 -07:00
Aanand Prasad
08bc4b830b Fix volume binds de-duplication
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-12 16:57:22 -04:00
David Calavera
421b9b6859 Merge pull request #13916 from Microsoft/10662-compileserver
Windows: Patch up compile after adjustCpuShares
2015-06-12 13:48:22 -07:00
Andrea Luzzardi
3ee1c37ba3 replica proxy: Improve error messages.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-06-12 13:27:35 -07:00
Victor Vieux
1afc1be2d1 support only 1.6.0+
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Victor Vieux
bc418df194 Merge pull request #936 from vieux/getting_started_mesos
add very simple getting started for mesos
2015-06-12 13:07:11 -07:00
John Howard
d2c5fcc8d5 Windows: Patch up compile after adjustCpuShares
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-12 13:00:59 -07:00
Tianon Gravi
9465272c28 Add new "validate-pkg" bundlescript
This helps ensure that `github.com/docker/docker/pkg/...` is actually safe to use in isolation (ie, doesn't import anything from `github.com/docker/docker` except other things from `pkg` or vendored dependencies).

Adding `github.com/docker/docker/utils` to the imports of `pkg/version/version.go`:

```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
These files import internal code: (either directly or indirectly)
 - pkg/version/version.go imports github.com/docker/docker/autogen/dockerversion
 - pkg/version/version.go imports github.com/docker/docker/utils
```

And then removing it again:

```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
Congratulations! "./pkg/..." is safely isolated from internal code.
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-12 12:28:23 -07:00
Li Shang
a653ddcb86 Merge pull request #629 from kitematic/create-container-button
Fixed create container button.
2015-06-12 12:03:44 -07:00
Sean Li
de9679101e Fixed long username and adjusted verify account layout. 2015-06-12 12:03:03 -07:00
Victor Vieux
3f0c3bc1c7 add getting started mesos
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 11:49:41 -07:00
Li Shang
084fc776da Merge pull request #628 from kitematic/fix-update-ui
Fixed auto-update button layout.
2015-06-12 11:47:28 -07:00
Sean Li
5cd4e54b4e Fixed create container button. 2015-06-12 11:46:24 -07:00
spf13
e568f0cdb0 Adding first draft of open source content 2015-06-12 14:37:28 -04:00
Sean Li
5e54051979 Fixed auto-update button layout. 2015-06-12 11:36:49 -07:00
Jeffrey Morgan
b1f09d2c7e Merge pull request #627 from kitematic/disable-clicking-preview
Disabled browsing web preview.
2015-06-12 11:36:36 -07:00
Jeffrey Morgan
43872916d9 Merge pull request #622 from TeckniX/fix-logs
Fixed stale log refresh
2015-06-12 11:27:15 -07:00
Antonio Murdaca
5bddafe169 Merge pull request #13912 from icecrime/13902_improve_test
Replace "sleep" by "top" in test implementation
2015-06-12 20:24:31 +02:00
Sean Li
8bdf2c9f6c Disabled browsing web preview. 2015-06-12 11:23:37 -07:00
David Calavera
e7533d7f81 Merge pull request #13494 from Microsoft/10662-vfsdriveroption
Windows: Allow VFS
2015-06-12 11:12:32 -07:00
Jeffrey Morgan
fef7f97dc2 Merge pull request #620 from kitematic/style-polish
Overall design polish and improvement
2015-06-12 11:10:39 -07:00
Sean Li
01eb54bd7a Fixed chopped off icon. 2015-06-12 11:03:03 -07:00
Antonio Murdaca
27e2837c6c Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp
Fixes content-type/length for stats stream=false
2015-06-12 19:53:18 +02:00
Sean Li
4e79e67404 Merge branch 'master' into style-polish
Conflicts:
	src/components/ContainerHomeFolders.react.js
	src/components/Containers.react.js
	styles/right-panel.less
	styles/variables.less
2015-06-12 10:48:55 -07:00
Arnaud Porterie
e5b7f61f09 Replace "sleep" by "top" in test implementation
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-12 10:45:42 -07:00
Arnaud Porterie
2351557607 Merge pull request #13902 from ibuildthecloud/api-fixes
Set omitempty for IP and PublicPort to conform w/ API 1.18
2015-06-12 10:42:07 -07:00
Brian Goff
855a056af7 Fixes content-type/length for stats stream=false
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-06-12 13:06:06 -04:00