From c9e6ca58ef1de7bfb27b1db952def2dbb7e3de86 Mon Sep 17 00:00:00 2001 From: mpl Date: Mon, 19 Oct 2015 22:05:59 +0200 Subject: [PATCH] deploy/gce: use our own systemd-docker image Fixes issue #646 Change-Id: I209132ec45cb433804b4cc86513aee252f17ea21 --- pkg/deploy/gce/deploy.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/deploy/gce/deploy.go b/pkg/deploy/gce/deploy.go index 8ed28ee09..a73829ca1 100644 --- a/pkg/deploy/gce/deploy.go +++ b/pkg/deploy/gce/deploy.go @@ -55,7 +55,7 @@ import ( const ( projectsAPIURL = "https://www.googleapis.com/compute/v1/projects/" // TODO(mpl): automatically pick the latest stable coreos image, if possible. - coreosImgURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-723-3-0-v20150804" + coreosImgURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-766-4-0-v20150929" // default instance configuration values. // TODO(mpl): they can probably be lowercased now that handler.go is in the same @@ -739,7 +739,8 @@ coreos: Requires=docker.service [Service] - ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker + ExecStartPre=/bin/bash -c '/usr/bin/curl https://storage.googleapis.com/camlistore-release/docker/systemd-docker.tar.gz | /bin/gunzip -c | /usr/bin/docker load' + ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin camlistore/systemd-docker ExecStart=/opt/bin/systemd-docker run --rm --name %n -v /var/lib/camlistore/mysql:/mysql -e INNODB_BUFFER_POOL_SIZE=NNN camlistore/mysql RestartSec=1s Restart=always @@ -757,7 +758,7 @@ coreos: Requires=docker.service mysql.service [Service] - ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker + ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin camlistore/systemd-docker ExecStartPre=/bin/bash -c '/usr/bin/curl https://storage.googleapis.com/camlistore-release/docker/camlistored.tar.gz | /bin/gunzip -c | /usr/bin/docker load' ExecStart=/opt/bin/systemd-docker run --rm -p 80:80 -p 443:443 --name %n -v /run/camjournald.sock:/run/camjournald.sock -v /var/lib/camlistore/tmp:/tmp --link=mysql.service:mysqldb camlistore/server RestartSec=1s