1
0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Commit Graph

1357 Commits

Author SHA1 Message Date
Evan Hazlett
3af29f3bef Merge pull request #1606 from hairyhenderson/verify-swarm-discovery-flag-1604
Verifying the --swarm-discovery flag
2015-07-29 11:52:12 -07:00
Evan Hazlett
bf7eaf4b22 Merge pull request #1602 from nathanleclaire/skip_wonky_osrelease_lines
Skip and warn on wonky /etc/os-release lines
2015-07-29 11:51:53 -07:00
Dave Henderson
fb0af73b80 Verifying the --swarm-discovery flag
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-29 08:01:18 -04:00
Nathan LeClaire
802393f253 Skip and warn on wonky /etc/os-release lines
If the lines don't split cleanly (occasionally STDERR gets mixed in, for
instance, due to our current SSH output setup), we should simply
log.Warn in the output instead of bailing completely.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-28 18:07:51 -07:00
Evan Hazlett
4a8e93ac9b Merge pull request #1600 from czerasz/patch-1
Documentation typo update
2015-07-28 09:35:40 -07:00
Michał Czeraszkiewicz
8a02efe0c9 Documentation typo update 2015-07-28 15:21:38 +02:00
Nathan LeClaire
ef9acc98b6 Merge pull request #1562 from jgeiger/patch-1
Update install-machine.md to reference 0.3.1
2015-07-27 11:19:32 -07:00
Joey Geiger
79b1af08e8 Remove specific version from link to binaries.
Signed-off-by: Joey Geiger <joey.geiger@irco.com>
2015-07-26 09:14:03 -06:00
Evan Hazlett
736ebb14fb Merge pull request #1552 from ehazlett/b2d-next
VirtualBox: Update to support new B2D
2015-07-24 18:20:42 -04:00
Evan Hazlett
0b03589187 fusion: use mkdir -p for home dir mount
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 17:34:07 -04:00
Evan Hazlett
65b5624221 proper check for hyper-v during upgrade
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 13:33:46 -04:00
Nathan LeClaire
c6660bf62c Merge pull request #1581 from ehazlett/swarm-advertise
Use --advertise for Swarm join
2015-07-24 10:24:38 -07:00
Evan Hazlett
030783af74 swarm: use --advertise instead of --addr for join
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 13:15:00 -04:00
Evan Hazlett
5f972ad759 fusion: @tianon to the rescue <3; shared folders work again
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 12:31:36 -04:00
Evan Hazlett
7b5e887275 hyperv: update to b2d-ng and some extra <3
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 10:20:47 -04:00
Evan Hazlett
5af751ecf1 b2d: re-enable upgrade for local
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:38:01 -04:00
Evan Hazlett
cb80c434ac b2d: use direct urls until release; devicemapper for engine opts tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

b2d-ng: use driver names for iso versions

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett
95c9b622dd fusion: update for b2d-ng
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett
c6e9849783 vbox: restrict regex matching for msys translated paths
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove tar loading from virtual disk creation

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

tests: use btrfs instead of overlay for custom option test

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett
e09f2fdd9c vbox: change to get latest released iso instead of pre-release
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: fix windows share dir for homedir

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

vbox: update tests for b2d

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett
ab31d52165 update vbox driver to work with new b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: lock down shared folders to user home dir

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

use env var for user for cross platform

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

vbox: remove sudo from setting ssh key for user

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

wip: use homedir for share

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-23 19:40:07 -04:00
Joey Geiger
6aca2c9faf Update install-machine.md to reference 0.3.1
Update the docs to include links to newest release.

Signed-off-by: jgeiger <jgeiger@gmail.com>
2015-07-22 20:19:41 -06:00
Evan Hazlett
ff8362848c Merge pull request #1543 from ehazlett/rpm-repos
use yum repos for redhat like distros
2015-07-22 21:34:29 -04:00
Evan Hazlett
b43a76deec add GetOsReleaseInfo to provisioner to assist in testing; add tests for rpm repo
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 20:56:28 -04:00
Evan Hazlett
01bf2ea2d7 use yum repos for redhat like distros
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 20:56:27 -04:00
Nathan LeClaire
03d4683755 Merge pull request #1503 from sergiobuj/add_status_command
Add status command
2015-07-22 15:55:45 -07:00
moxiegirl
1148a4590e Merge pull request #1563 from ehazlett/changelog
rename changelog
2015-07-22 15:11:48 -07:00
Evan Hazlett
9c3ec2e92a rename changelog
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 13:35:41 -04:00
Nathan LeClaire
ad6d8d49a8 Merge pull request #1497 from udryan10/engine-set-proxy-config
added {http,https,no} proxy support to docker engines
2015-07-21 17:25:16 -07:00
Evan Hazlett
89e6530528 Merge pull request #1501 from nathanleclaire/bail_on_failed_ssh
Bail on failed SSH command with information about what failed
2015-07-21 17:52:15 -04:00
Nathan LeClaire
6db82141f0 Bail on failed SSH command with information about what failed
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-21 14:49:24 -07:00
Evan Hazlett
066ef3c4f4 Merge pull request #1550 from moxiegirl/update-docs-dockerfile
Updating to point to latest build
2015-07-20 09:39:20 -04:00
Mary Anthony
60be68c73c Updating to point to latest build
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:44:46 -07:00
Ryan Grothouse
d553a2c757 added support for setting environment variables in docker engines
Signed-off-by: Ryan Grothouse <rgrothouse@gmail.com>
2015-07-16 16:12:06 -04:00
Nathan LeClaire
2c36635dd4 Merge pull request #1377 from nathanleclaire/integration_rm_rm
Make some clean ups and fixes to the integration tests
2015-07-15 11:52:02 -07:00
Nathan LeClaire
f74d71741f Merge pull request #1525 from tg123/stdout
change inspect output to stdout (was stderr)
2015-07-15 10:46:42 -07:00
tgic
d5f3f37d8f change inspect output to stdout (was stderr)
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-15 20:35:48 +08:00
Sergio Botero
918ed6a135 Add integration test for status command
Use `log.Info` instead of `fmt.Println`

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
2015-07-14 19:10:43 -07:00
Sergio Botero
87cf7e222e Add status command
closes #1471 by adding the status command that prints the state of a
machine.

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
2015-07-14 19:10:40 -07:00
Nathan LeClaire
e054d06163 Merge pull request #1490 from moxiegirl/split-out-docs
First stage of splitting out
2015-07-14 18:26:22 -07:00
Mary Anthony
39806c02e0 First stage of splitting out
Splitting out docs
Fixing location of help
entering in changes from testing
Filling in some missing structure
Updating with the comments from Nathan
Updating with the comments from Nathan
Updating after talk with Evan/Nathan

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-14 12:44:56 -07:00
Nathan LeClaire
70238f79ad Merge pull request #1300 from hairyhenderson/restart-suggest-rerun-env-1298
Warning user that the active machine was restarted and may have a new IP
2015-07-14 11:52:51 -07:00
Dave Henderson
f2284b2bd5 Just informing the user that re-eval may be necessary, instead of going to the trouble of trying to detect IP changes
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-13 20:36:05 -04:00
Dave Henderson
07f2972dda Warning user that the active machine was restarted and may have a new IP
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-13 20:34:19 -04:00
Nathan LeClaire
4d0fdaadd4 Merge pull request #1519 from ehazlett/docs-remove-install-links
remove direct install links
2015-07-13 17:33:54 -07:00
Nathan LeClaire
cd55ca0030 Merge pull request #1506 from ericsage/1502
Return better error for issue #1502.
2015-07-13 17:33:30 -07:00
Eric Sage
6410da8f34 Switch to errors.New
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 20:09:59 -04:00
Evan Hazlett
09a73a2373 remove direct install links
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-13 18:20:42 -04:00
Eric Sage
b75b5d618c Change error message
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 17:45:46 -04:00
Evan Hazlett
f8456d8bba Merge pull request #1494 from nathanleclaire/rename_machine_to_provider
Rename libmachine.Machine to libmachine.Provider
2015-07-11 20:33:22 -06:00