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

Made cmds constants. 

Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
This commit is contained in:
Dan Lorenc 2014-12-16 15:40:56 -08:00
parent 5525cf9f6f
commit 328977c83e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/googlecomputeengine/compute_util.go
View File

@ -26,12 +26,20 @@ type ComputeUtil struct {
const ( const (
apiURL = "https://www.googleapis.com/compute/v1/projects/" apiURL = "https://www.googleapis.com/compute/v1/projects/"
imageName = "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141016" imageName = "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141016"
dockerUrl = "https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth"
firewallRule = "docker-machines" firewallRule = "docker-machines"
port = "2376" port = "2376"
firewallTargetTag = "docker-machine" firewallTargetTag = "docker-machine"
) )
const (
stopDocker = "sudo service docker stop"
makeKeysDir = "sudo mkdir -p /.docker/authorized-keys.d/"
setKeysDirPermissions = "sudo chown -R %v /.docker"
waitForDockerToStop = "while [ -e /var/run/docker.pid ]; do sleep 1; done"
setDockerOpts = "sudo sed -i 's/DOCKER_OPTS=.*/DOCKER_OPTS=\"--auth=identity -H unix:\\/\\/\\/var\\/run\\/docker.sock -H 0.0.0.0:2376\"/g' /etc/default/docker"
downloadDocker = "sudo wget https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth -O /usr/bin/docker && sudo chmod +x /usr/bin/docker"
)
// NewComputeUtil creates and initializes a ComputeUtil. // NewComputeUtil creates and initializes a ComputeUtil.
func newComputeUtil(driver *Driver) (*ComputeUtil, error) { func newComputeUtil(driver *Driver) (*ComputeUtil, error) {
service, err := newGCEService(driver.storePath) service, err := newGCEService(driver.storePath)
@ -213,14 +221,14 @@ func (c *ComputeUtil) updateDocker(d *Driver) error {
return fmt.Errorf("error retrieving ip: %v", err) return fmt.Errorf("error retrieving ip: %v", err)
} }
commands := []string{ commands := []string{
"sudo service docker stop", stopDocker,
// The user will need to copy their key to this directory. // The user will need to copy their key to this directory.
"sudo mkdir -p /.docker/authorized-keys.d/", makeKeysDir,
fmt.Sprintf("sudo chown -R %v /.docker", d.UserName), fmt.Sprintf(setKeysDirPermissions, d.UserName),
// Wait for docker to actually stop before modifying the config. // Wait for docker to actually stop before modifying the config.
"while [ -e /var/run/docker.pid ]; do sleep 1; done", waitForDockerToStop,
"sudo sed -i 's/DOCKER_OPTS=.*/DOCKER_OPTS=\"--auth=identity -H unix:\\/\\/\\/var\\/run\\/docker.sock -H 0.0.0.0:2376\"/g' /etc/default/docker", setDockerOpts,
fmt.Sprintf("sudo wget %v -O /usr/bin/docker && sudo chmod +x /usr/bin/docker", dockerUrl)} downloadDocker}
if err := c.executeCommands(commands, ip, d.sshKeyPath); err != nil { if err := c.executeCommands(commands, ip, d.sshKeyPath); err != nil {
return err return err
} }