mirror of https://github.com/docker/docs.git
Merge pull request #189 from ehazlett/docker-1.4.1
use 1.4.1 identity build
This commit is contained in:
commit
91bec81903
|
@ -245,7 +245,7 @@ func (d *Driver) Create() error {
|
|||
|
||||
log.Debugf("HACK: Downloading version of Docker with identity auth...")
|
||||
|
||||
cmd, err = d.GetSSHCommand("sudo curl -sS -o /usr/bin/docker https://ehazlett.s3.amazonaws.com/public/docker/linux/docker-1.4.0-dev-identity")
|
||||
cmd, err = d.GetSSHCommand("sudo curl -sS -o /usr/bin/docker https://ehazlett.s3.amazonaws.com/public/docker/linux/docker-1.4.1-136b351e-identity")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -275,7 +275,7 @@ func (driver *Driver) hackForIdentityAuth() error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := driver.runSSHCommand("sudo bash -c \"curl -sS https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth > /usr/bin/docker\"", numberOfRetries); err != nil {
|
||||
if err := driver.runSSHCommand("sudo bash -c \"curl -sS https://ehazlett.s3.amazonaws.com/public/docker/linux/docker-1.4.1-136b351e-identity > /usr/bin/docker\"", numberOfRetries); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ func (d *Driver) Create() error {
|
|||
return err
|
||||
}
|
||||
|
||||
cmd, err = d.GetSSHCommand("curl -sS https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth > /usr/bin/docker")
|
||||
cmd, err = d.GetSSHCommand("curl -sS https://ehazlett.s3.amazonaws.com/public/docker/linux/docker-1.4.1-136b351e-identity > /usr/bin/docker")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -132,8 +132,8 @@ func (d *Driver) Create() error {
|
|||
return err
|
||||
}
|
||||
} else {
|
||||
// HACK: Docker 1.3 boot2docker image with client/daemon auth
|
||||
isoURL = "https://ehazlett.s3.amazonaws.com/public/boot2docker/boot2docker-machine-87e3813.iso"
|
||||
// HACK: Docker 1.4.1 boot2docker image with client/daemon auth
|
||||
isoURL = "https://ejhazlett.s3.amazonaws.com/public/boot2docker/machine-b2d-docker-1.4.1-identity.iso"
|
||||
|
||||
// todo: check latest release URL, download if it's new
|
||||
// until then always use "latest"
|
||||
|
|
Loading…
Reference in New Issue