docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

redhat: remove aws check; update docs 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-05-19 17:30:12 -04:00
parent 380aaa2670
commit bf7a5f2f53
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/index.md
View File

@ -1388,7 +1388,7 @@ The default base operating system for Machine is Boot2Docker on local providers
(VirtualBox, Fusion, Hyper-V, etc) and the latest Ubuntu LTS supported
by the cloud provider. RedHat Enterprise Linux is also supported. To use
RHEL, you will need to select the image accordingly with the provider. For
example, in Amazon EC2, you could use "ami-12663b7a" as the
example, in Amazon EC2, you could use a RedHat 7.1 AMI ("ami-12663b7a") as the
`--amazonec2-ami` option which create an instance using RHEL 7.1 64-bit.
## Release Notes

8
libmachine/provision/redhat.go
View File

@ -91,14 +91,6 @@ func (provisioner *RedHatProvisioner) Package(name string, action pkgaction.Pack
return nil
}
func (provisioner *RedHatProvisioner) isAWS() bool {
if _, err := provisioner.SSHCommand("curl -s http://169.254.169.254/latest/meta-data/ami-id"); err != nil {
return false
}
return true
}
func installDocker(provisioner *RedHatProvisioner) error {
if err := provisioner.installOfficialDocker(); err != nil {
return err