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
Evan Hazlett
182dc34367 remove generate-swarm-token docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-21 19:44:32 -05:00
Evan Hazlett
0b5299bcf0 Merge pull request #575 from andrewwatson/fix-564-govcerr
fixes #564 by surfacing govc errors to end user
2015-02-21 16:32:11 -08:00
Evan Hazlett
772255dd88 Merge pull request #577 from andrewwatson/fix-576-err-return
Fixes #576 by return the err
2015-02-21 16:31:37 -08:00
Ray Tsang
64544bd1c0 Add google-scopes option to specify Compute Engine scopes
Signed-off-by: Ray Tsang <saturnism@gmail.com>
2015-02-21 17:21:12 -05:00
hyp3rdino
29b62053c4 Update mac.md
'docker hello-world' is not a docker command. 'docker run hello-world' is correct.

Signed-off-by: Markus Kortlang <hyp3rdino@googlemail.com>
2015-02-21 19:25:37 +01:00
Brian Goff
7122b6643e Check nil volume on mount init
Fixes #10685 panic in some cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-21 07:21:57 -05:00
Alexander Morozov
f207dd5e7c Merge pull request #10439 from estesp/10426-fix-arg-list-too-long
Pass excludes/options to tar unarchiver via environment versus cmd line
2015-02-20 23:48:55 -08:00
Ahmet Alp Balkan
102e061147 integration-cli: add test requirement ExecSupport
Skip tests based on remote daemon's exec support (to exclude
these tests from `make test` ran in LXC case). Makes use of
`test_no_exec` build tag passed by build scripts.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-20 23:24:30 -08:00
Ahmet Alp Balkan
6bbb456138 readContainerFileWithExec for links tests
Shout out to @estesp for the idea. Some use cases of
`readContainerFile` can be replaced with `docker exec $id cat $file`.
This helper method can eliminate the requirement that
host/cli should be on the same machine.

TestRunMutableNetworkFiles and TestRunResolvconfUpdater still
need to access the docker host filesystem as they modify
the file directly from there assuming cli and daemon are
on the same machine.

This fixes TestLinksUpdateOnRestart and TestLinksHostsFilesInject
for Windows CI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-20 23:14:38 -08:00
Andrew Watson
9ff6dbe0b2 Fixes #576 by return the err
Signed-off-by: Andrew Watson <andrewmoorewatson@gmail.com>
2015-02-21 00:15:47 -05:00
Nghia Tran
b422d8da8f engine.Tail() to ignore trailing whitespaces.
In its current form, if an error message has two trailing "\n" instead
of one, an empty line is resulted (see engine/job.go for an example of
such usages).

Skipping all trailing whitespaces will give a better error message.

Signed-off-by: Nghia Tran <nghia@google.com>
2015-02-20 19:42:01 -08:00
Frederick F. Kautz IV
d80a856fc1 Fixing build, GoDeps entry for github.com/MSOpenTech/azure-sdk-for-go was pointing to the wrong location 2015-02-20 17:45:25 -08:00
Jessie Frazelle
b062ef05e5 Merge pull request #10909 from ahmetalpbalkan/run_test-defer
integration-cli: Better test cleanup with defer
2015-02-20 17:28:08 -08:00
Alexander Morozov
4ba1128c18 Merge pull request #10871 from ahmetalpbalkan/win-cli/TestBuildAddBadLinks-fix
integ-cli: Fix TestBuildAddBadLinks for windows
2015-02-20 17:27:36 -08:00
Andrew Watson
c481442fe0 fixes #564 by surfacing govc errors to end user
Signed-off-by: Andrew Watson <andrewmoorewatson@gmail.com>
2015-02-20 20:25:35 -05:00
Michael Crosby
1d382f9c2d Merge pull request #10865 from ahmetalpbalkan/win-cli/tar-path
pkg/archive: Canonicalize stored paths
2015-02-20 17:20:51 -08:00
Alexander Morozov
5919f1b16c Merge pull request #10844 from ahmetalpbalkan/win-cli/TestBuildDockerfileOutsideContext-path-improvement
integration-cli: pass platform-compatible paths to os.Symlink
2015-02-20 17:19:37 -08:00
Michael Crosby
828e76a5aa Add issue triage document
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-20 17:19:08 -08:00
Jeffrey Morgan
d82560c313 Merge pull request #194 from kitematic/metrics
Adding metrics
2015-02-20 15:36:35 -08:00
Jeffrey Morgan
72b8d6cc81 Fixing merge 2015-02-20 15:33:26 -08:00
Jeffrey Morgan
15328fa260 Merge branch 'master' into metrics
Conflicts:
	src/ImageCard.react.js
2015-02-20 15:32:18 -08:00
Jeffrey Morgan
abc3f05cb5 Fix tests 2015-02-20 15:29:19 -08:00
Evan Hazlett
75e3e8e956 Merge pull request #571 from nathanleclaire/fix_ssh_doc
Update SSH documentation
2015-02-20 15:23:01 -08:00
Evan Hazlett
20ffc488f0 Merge pull request #566 from SvenDowideit/add-docker-docs-scafolding
Add the docs.docker.com build tooling
2015-02-20 15:17:46 -08:00
Jeffrey Morgan
e7aaeeaf21 Adding metrics 2015-02-20 15:09:25 -08:00
Bradley Wright
54ca9aca71 Fix erroneously wrapped URLs in links
Some of the links in this document contained hard-wrapped URL portions, which causes Markdown to insert a literal URL encoded `\n` inside the link, thus breaking them.

Signed-off-by: Bradley Wright <brad@intranation.com>
2015-02-20 23:05:52 +00:00
Sean Li
791b4c99b5 Fixed tab color. 2015-02-20 14:39:13 -08:00
Sean Li
9735182e43 Restyled image card tag icon. 2015-02-20 14:20:02 -08:00
Sean Li
65195bcc33 Will now redirect if developing locally. 2015-02-20 14:16:42 -08:00
Sean Li
968e09ab12 Container list item tweak. 2015-02-20 14:07:57 -08:00
Ahmet Alp Balkan
70407ce40c Better test cleanup with defer
This fixes a few misuses of `deleteAllContainers()` cleanup
method in integration-cli suite by moving call to the
beginning of the method and guaranteeing their execution
(including panics) with `defer`s.

Also added some forgotten cleanup calls while I'm at it.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-20 14:04:36 -08:00
Evan Hazlett
53414ded4e Merge pull request #573 from ehazlett/update-godeps
update godeps (remove swarm discovery dependency)
2015-02-20 13:51:25 -08:00
Evan Hazlett
04a0d398b2 update godeps (remove swarm discovery dependency)
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:49:17 -08:00
Sean Li
8eccec8958 Prevent dragging in files from redirecting. 2015-02-20 13:47:24 -08:00
Evan Hazlett
8a8e429cb1 Merge pull request #464 from ehazlett/swarm
Swarm Provisioning
2015-02-20 13:42:11 -08:00
Doug Davis
92c353582c Build w/o verbose hangs w/RUN
`docker build -q .` where Dockerfile contains a RUN cmd will hang on the
RUN. It waits for the output stream to close but because of -q we never
attached to the container and end up waiting forever.

The fact that no one noticed this tells me that people may not actually
use -q and if so I wonder if it would make sense to make -q work the may
it does for other commands (like `docker ps`) and make it so it only
shows the container ID at the end.  A -q/quiet option that only hides the
container RUN output apparently isn't really that useful since no one is
using it.  See: https://github.com/docker/docker/issues/4094

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-20 13:38:03 -08:00
Evan Hazlett
82a686fc7c remove generate-swarm-token command; fix tests; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:36:06 -08:00
Ahmet Alp Balkan
d0dc14e5d6 integ-cli: Fix TestBuildAddBadLinks for windows
TestBuildAddBadLinks used to build a path by
concenating unix-style forward slashes. Fixed that
by providing a windows-equivalent using `runtime.GOOS`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-20 13:24:59 -08:00
Jessie Frazelle
f70567e9a9 Merge pull request #10900 from moxiegirl/connection-reset-by-peer-faq
Adding info to faq per customer problem.
2015-02-20 13:20:28 -08:00
Sean Li
22933a2195 Minor CSS tweak for image cards. 2015-02-20 13:15:40 -08:00
Jessie Frazelle
aa057fd3b3 Merge pull request #10838 from moxiegirl/mac-update
Adding in updates for Mac for upcoming events
2015-02-20 13:10:29 -08:00
Evan Hazlett
d017162aba update machine guide for swarm
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
a48dfd3448 use swarm master also as node
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
3a3ef6f45e add discovery to machine config; show swarm membership
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
b908a9e655 use official swarm image
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
a949e12b6e store swarm config in driver; vendor Godeps; generate swarm token
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
16e8159503 virtualbox swarm support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
b996cb7e9e azure: use IP when calling GetIP for proper certs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett
730f0dc68c google: configure firewall if swarm master
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
Evan Hazlett
4e95c2760f authorize swarm port when master is in ec2; fix max dns name for azure
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00