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

Merge "deploy/gce: use our own systemd-docker image"

This commit is contained in:
Mathieu Lonjaret 2015-10-19 20:30:37 +00:00 committed by Gerrit Code Review
parent c90ae0219c c9e6ca58ef
commit 8f31f48fe1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/deploy/gce/deploy.go
View File

@ -55,7 +55,7 @@ import (
const ( const (
projectsAPIURL = "https://www.googleapis.com/compute/v1/projects/" projectsAPIURL = "https://www.googleapis.com/compute/v1/projects/"
// TODO(mpl): automatically pick the latest stable coreos image, if possible. // 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. // default instance configuration values.
// TODO(mpl): they can probably be lowercased now that handler.go is in the same // TODO(mpl): they can probably be lowercased now that handler.go is in the same
@ -739,7 +739,8 @@ coreos:
Requires=docker.service Requires=docker.service
[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 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 RestartSec=1s
Restart=always Restart=always
@ -757,7 +758,7 @@ coreos:
Requires=docker.service mysql.service Requires=docker.service mysql.service
[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' 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 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 RestartSec=1s