From ecfe57234ff350a51b2f3c596baab258f535419c Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 28 May 2014 11:23:47 -0700 Subject: [PATCH] backend/gce: switch to container-vm image --- backends/gce.go | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/backends/gce.go b/backends/gce.go index b1dc4de2c9..7c36c5fb25 100644 --- a/backends/gce.go +++ b/backends/gce.go @@ -42,21 +42,12 @@ var ( "/zones/us-central1-a/machineTypes/n1-standard-1", "The reference to the instance type to create.") gceImage = flag.String("image", - "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20131127", + "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20140522", "The GCE image to boot from.") gceDiskName = flag.String("diskname", "docker-root", "Name of the instance root disk") gceDiskSizeGb = flag.Int64("disksize", 100, "Size of the root disk in GB") ) -const startup = `#!/bin/bash -sysctl -w net.ipv4.ip_forward=1 -wget -qO- https://get.docker.io/ | sh -until test -f /var/run/docker.pid; do sleep 1 && echo waiting; done -grep mtu /etc/default/docker || (echo 'DOCKER_OPTS="-H :8000 -mtu 1460"' >> /etc/default/docker) -service docker restart -until echo 'GET /' >/dev/tcp/localhost/8000; do sleep 1 && echo waiting; done -` - // A Google Compute Engine implementation of the Cloud interface type GCECloud struct { service *compute.Service @@ -258,14 +249,6 @@ func (cloud GCECloud) CreateInstance(name string, zone string) (string, error) { Network: prefix + "/global/networks/default", }, }, - Metadata: &compute.Metadata{ - Items: []*compute.MetadataItems{ - { - Key: "startup-script", - Value: startup, - }, - }, - }, } log.Printf("starting instance: %q", name) op, err := cloud.service.Instances.Insert(cloud.projectId, zone, instance).Do()