docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,394 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1394 Commits

Author SHA1 Message Date
Evan Hazlett 8f82b76274 Merge pull request #1669 from moxiegirl/fix-index-links 
Fixing links that weren't resolving
 2015-08-11 12:02:06 -04:00
Mary Anthony ecb727822c Fixing links that weren't resolving 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 08:59:18 -07:00
Evan Hazlett cf10bf45b5 Merge pull request #1668 from ehazlett/carry-1454-ec2-private-address 
Amazon Ec2 - Add the option amazonec2-use-private-address
 2015-08-11 07:32:23 -04:00
Rodrigo Reis 04b435c832 Amazon Ec2 - Add the option amazonec2-use-private-address 
Signed-off-by: Rodrigo Reis <rodrigo@rodrigoreis.com>
 2015-08-11 07:29:13 -04:00
Evan Hazlett c1acb74d7a Merge pull request #1508 from ericsage/filter_names 
Add name filter for #1488
 2015-08-11 06:33:09 -04:00
Evan Hazlett 226dc8d15a Merge pull request #1660 from ehazlett/changelog-0.4 
changelog updates for 0.4.0
 2015-08-10 15:16:03 -04:00
Evan Hazlett c5f0cfa041
do not time travel and learn to spell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-10 13:44:07 -04:00
Evan Hazlett 83743d3134 Merge pull request #1647 from agup006/640-azure-docker-machine 
Add Azure Swarm Master Port endpoint configuration when using docker …
 2015-08-10 10:03:05 -04:00
Evan Hazlett 0c96ea0de2 Merge pull request #1656 from mattjmcnaughton/1651-single-check-for-active-machine 
Use a single function for checking active machine
 2015-08-10 10:01:09 -04:00
Evan Hazlett 459915c57c
changelog updates for 0.4.0 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-10 09:52:46 -04:00
Matt McNaughton 003770f2d4 Use a single function for checking active machine 
Fix https://github.com/docker/machine/issues/1651

As pointed out in the issue above, the `active` and `ls` commands used
different methods for determing the active machine. This commit defines
a single method on the `host` struct called `IsActive` which provides
a uniform check for machine activness. `IsActive` returns true only
if `DOCKER_HOST == url` and the state is not stopped - previously the
`active` command only checked the url.

* Add a single `host` method `IsActive` for determining if a machine is
  active.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
 2015-08-07 15:58:51 -04:00
Nathan LeClaire 1c6960f5ca Merge pull request #1653 from nathanleclaire/integration-fixups 
Add some fixups to the integration tests
 2015-08-06 14:08:29 -07:00
Anurag Gupta 938290f773 removed extra code and fixed code formatting in azure addDockerEndpoint 
Signed-off-by: Anurag Gupta <agup006@gmail.com>
 2015-08-06 18:32:30 +00:00
Nathan LeClaire d79f1eb9f3 Add some fixups to the integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-08-06 00:42:56 -07:00
moxiegirl 73c548c1f9 Merge pull request #1649 from moxiegirl/update-build-infrastructure 
Install and infrastructure fixes
 2015-08-05 16:12:16 -07:00
Mary Anthony 1749d99b31 - Updating install docs fixes #1648 
- Updating the Dockerfile to lastest
- Adding support for building all the public doc projects from machine

Signed-off-by: Mary Anthony <mary@docker.com>

Michael's comments

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in comments from nathan

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-05 16:06:50 -07:00
Anurag Gupta 99544a4cb0 Add Azure Swarm Master Port endpoint configuration when using docker machine. 
Signed-off-by: Anurag Gupta <agup006@gmail.com>
 2015-08-05 08:17:51 +00:00
Nathan LeClaire af08468f00 Merge pull request #1640 from nathanleclaire/revert_ngb2d 
Revert "Merge pull request #1552 from ehazlett/b2d-next"
 2015-08-03 15:20:39 -07:00
Nathan LeClaire 8ba5a57072 Revert "Merge pull request #1552 from ehazlett/b2d-next" 
This reverts commit 736ebb14fb, reversing
changes made to c6660bf62c.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-08-03 14:46:52 -07:00
Nathan LeClaire 633462d5b1 Merge pull request #1623 from dgageot/master 
Doc for static IP and preemptibility
 2015-08-03 11:50:26 -07:00
David Gageot 48f8d5b533
Doc for static IP and preemptibility 
Signed-off-by: David Gageot <david@gageot.net>
 2015-08-01 08:30:30 +02:00
Evan Hazlett 12f7ac57ae Merge pull request #1467 from dgageot/master 
Support Static IPs and Preemptible instances on Google Compute Engine
 2015-07-31 05:45:06 -07:00
Evan Hazlett 1469b3b704 Merge pull request #1612 from skatsuta/empty-dockerhost-active 
libmachine: Filestore#GetActive() should return an error if DOCKER_HOST is empty
 2015-07-31 05:15:08 -07:00
Evan Hazlett a51e4aaf5d Merge pull request #1620 from skatsuta/fix-hostname-test 
libmachine: fix a test to check a host name is the same as expected
 2015-07-31 05:05:58 -07:00
Soshi Katsuta 3f41f8ac4c libmachine: fix a test error message to show an expected host name 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:38:00 +09:00
Soshi Katsuta c8987830b9 libmachine: fix a test to check the host name is right 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:37:46 +09:00
Soshi Katsuta 47a890f27f libmachine: change an error message in Filestore#GetActive() 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:05:54 +09:00
Evan Hazlett 751e80eefd Merge pull request #1597 from nathanleclaire/ls_timeout 
Add Timeout state to ls command
 2015-07-30 17:54:28 -07:00
Nathan LeClaire e9c285cf6a Add Timeout state to ls command 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-30 13:44:40 -07:00
Soshi Katsuta aba294cbb1 libmachine: return an error if DOCKER_HOST is empty 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-30 19:50:08 +09:00
Evan Hazlett 7614212d4f Merge pull request #1564 from nathanleclaire/revert_migration 
Revert configuration migration removal, include new version field, and introduce migration boilerplate
 2015-07-29 16:50:49 -07:00
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
Nathan LeClaire fb2e843e99 - Re-introduce config migration; fix panics occurring from older configs 
- Introduce boilerplate for config.json migrations

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-28 15:38:16 -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