Add a guide container

+ Vacuum cron Fixes docker-archive#623
+ Start integrating buoy
+ Start integrating cleanup

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

Diff for: Makefile

@@ -34,8 +34,10 @@ buoy:
 	$(MAKE) -C tools/buoy
 	mkdir -p aws/dockerfiles/files/bin || true
 	mkdir -p azure/dockerfiles/files/bin || true
+	mkdir -p gcp/dockerfiles/guide/bin || true
 	cp tools/buoy/bin/buoy aws/dockerfiles/files/bin/buoy
 	cp tools/buoy/bin/buoy azure/dockerfiles/files/bin/buoy
+	cp tools/buoy/bin/buoy gcp/dockerfiles/guide/bin/buoy
 
 moby/alpine/cloud/azure/vhd_blob_url.out: moby
 	$(MAKE) -C moby/alpine azure

Diff for: gcp/dockerfiles/guide/.gitignore

@@ -0,0 +1 @@
+bin

Diff for: gcp/dockerfiles/guide/Dockerfile

@@ -0,0 +1,13 @@
+FROM alpine:3.5
+
+RUN apk add --update bash openssh ca-certificates sudo curl jq tar python py-setuptools shadow
+
+ENTRYPOINT ["/entry.sh"]
+
+RUN mkdir -p /usr/docker /var/log/docker/
+COPY crontab.txt /usr/docker/
+COPY entry.sh /
+COPY vacuum.sh cleanup.sh buoy.sh /usr/bin/
+COPY bin/buoy /usr/bin
+
+RUN /usr/bin/crontab /usr/docker/crontab.txt

Diff for: gcp/dockerfiles/guide/Makefile

@@ -0,0 +1,18 @@
+DOCKER_REPO_OWNER ?= docker4x
+DOCKER_REPO ?= ${DOCKER_REPO_OWNER}/guide-gcp
+DOCKER_TAG ?= latest
+DOCKER_IMAGE ?= ${DOCKER_REPO}:${DOCKER_TAG}
+DOCKER_BUILD_FLAGS ?= --no-cache --pull
+DOCKER_PUSH ?= true
+
+.PHONY: all build push
+.DEFAULT: all
+all: build push
+
+build:
+	@docker build $(DOCKER_BUILD_FLAGS) -t $(DOCKER_IMAGE) .
+
+push:
+ifeq ($(DOCKER_PUSH),true)
+	@docker push $(DOCKER_IMAGE)
+endif

Diff for: gcp/dockerfiles/guide/buoy.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# this script calls buoy with correct parameters
+if [ "$NODE_TYPE" == "worker" ] ; then
+    # this doesn't run on workers, only managers.
+    exit 0
+fi
+
+IS_LEADER=$(docker node inspect self -f '{{ .ManagerStatus.Leader }}')
+
+if [[ "$IS_LEADER" == "true" ]]; then
+    # we are the leader, so call buoy. We only need to call once, so we only call from the current leader.
+    NUM_MANAGERS=$(docker info | grep Managers | cut -f2 -d: | sed -e 's/^[ \t]*//')
+    TOTAL_NODES=$(docker info | grep Nodes | cut -f2 -d: | sed -e 's/^[ \t]*//')
+    NUM_WORKERS=$(expr $TOTAL_NODES - $NUM_MANAGERS)
+    NUM_SERVICES=$(docker service ls -q | wc -w)
+    DOCKER_VERSION=$(docker version --format '{{.Server.Version}}')
+    SWARM_ID=$(docker info | grep ClusterID | cut -f2 -d: | sed -e 's/^[ \t]*//')
+
+    /usr/bin/buoy -event="swarm:ping" -workers=$NUM_WORKERS -managers=$NUM_MANAGERS -services=$NUM_SERVICES \
+        -docker_version=$DOCKER_VERSION -swarm_id=$SWARM_ID -flavor=aws
+fi

Diff for: gcp/dockerfiles/guide/cleanup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "TODO"

Diff for: gcp/dockerfiles/guide/crontab.txt

@@ -0,0 +1,4 @@
+# crontab
+42 1 * * * /usr/bin/vacuum.sh >> /var/log/docker/vacuum.log
+*/5 * * * * /usr/bin/cleanup.sh >> /var/log/docker/cleanup.log
+24 * * * * /usr/bin/buoy.sh >> /var/log/docker/buoy.log

Diff for: gcp/dockerfiles/guide/entry.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Initialize logging for guide daemons"
+# setup symlink to output logs from relevant scripts to container logs
+ln -s /proc/1/fd/1 /var/log/docker/cleanup.log
+
+# start cron
+/usr/sbin/crond -f -l 9 -L /var/log/cron.log

Diff for: gcp/dockerfiles/guide/vacuum.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+RUN_VACUUM=${RUN_VACUUM:-"no"}
+if [[ "$RUN_VACUUM" != "yes" ]] ; then
+    exit 0
+fi
+
+# sleep for a random amount of time, so that we don't run this at the same time on all nodes.
+sleep $[ ( $RANDOM % 240 )  + 1 ]
+
+docker system prune --force

Diff for: gcp/templates/startup/script.sh

@@ -8,7 +8,8 @@ DOCKER_FOR_IAAS_VERSION='{{ VERSION }}'
 
 docker_run='docker run --label com.docker.editions.system --log-driver=json-file'
 docker_daemon="$docker_run -d"
-docker_client='-v /var/run/docker.sock:/var/run/docker.sock'
+docker_socket='-v /var/run/docker.sock:/var/run/docker.sock'
+docker_cli='-v /usr/bin/docker:/usr/bin/docker'
 
 function dockerPull {
   for i in $(seq 1 60); do docker pull $1 && break || sleep 1; done
@@ -69,13 +70,25 @@ $docker_daemon --name=accounts \
 
 dockerRm shell
 $docker_daemon --name=shell -p 22:22 \
-  $docker_client \
-  -v /usr/bin/docker:/usr/bin/docker \
+  $docker_socket \
+  $docker_cli \
   -v /var/log:/var/log \
   -v /home:/home \
   --volumes-from=etc \
   $shell_image
 
+echo Start guide
+
+guide_image="docker4x/guide-gcp:$DOCKER_FOR_IAAS_VERSION"
+dockerPull ${guide_image}
+
+dockerRm guide
+$docker_daemon --name=guide \
+  -e RUN_VACUUM="{{ properties['enableSystemPrune'] }}" \
+  $docker_socket \
+  $docker_cli \
+  $guide_image
+
 {% if (type in ['manager', 'leader']) %}
 echo Start infrakit
 
@@ -92,7 +105,7 @@ dockerRm flavor-combo
 $run_plugin --name=flavor-combo $infrakit_image infrakit-flavor-combo --log=5
 
 dockerRm flavor-swarm
-$run_plugin --name=flavor-swarm $docker_client $infrakit_image infrakit-flavor-swarm --log=5
+$run_plugin --name=flavor-swarm $docker_socket $infrakit_image infrakit-flavor-swarm --log=5
 
 dockerRm flavor-vanilla
 $run_plugin --name=flavor-vanilla $infrakit_image infrakit-flavor-vanilla --log=5
@@ -104,15 +117,15 @@ dockerRm instance-gcp
 $run_plugin --name=instance-gcp $infrakit_gcp_image infrakit-instance-gcp --log=5
 
 dockerRm manager
-$run_plugin --name=manager $docker_client $infrakit_image infrakit-manager swarm --proxy-for-group=group-stateless --name=group --log=5
+$run_plugin --name=manager $docker_socket $infrakit_image infrakit-manager swarm --proxy-for-group=group-stateless --name=group --log=5
 
 echo Start Load Balancer Listener
 
 lb_image="docker4x/l4controller-gcp:$DOCKER_FOR_IAAS_VERSION"
 dockerPull ${lb_image}
 
 dockerRm lbcontroller
-$docker_daemon --name=lbcontroller $docker_client $lb_image run --log=5
+$docker_daemon --name=lbcontroller $docker_socket $lb_image run --log=5
 {% endif -%}
 
 {% if (type in ['leader']) %}

Diff for: gcp/templates/swarm.jinja.schema

@@ -52,3 +52,8 @@ properties:
     type: boolean
     default: False
     description: Are workers preemptible?
+
+  enableSystemPrune:
+    type: string
+    default: "yes"
+    description: Cleans up unused images, containers, networks and volumes

Diff for: tools/buoy/build_buoy.sh

@@ -17,6 +17,7 @@ docker run --name $DOCKER_CONTAINER_NAME $DOCKER_IMAGE_NAME ./compile_buoy.sh
 mkdir -p bin
 docker cp $DOCKER_CONTAINER_NAME:/go/bin/buoy bin/buoy
 
-mkdir -p ../../aws/dockerfiles/files/bin/ ../../azure/dockerfiles/files/bin/
+mkdir -p ../../aws/dockerfiles/files/bin/ ../../azure/dockerfiles/files/bin/ ../../gcp/dockerfiles/guide/bin/
 cp bin/buoy ../../aws/dockerfiles/files/bin/buoy
 cp bin/buoy ../../azure/dockerfiles/files/bin/buoy
+cp bin/buoy ../../gcp/dockerfiles/guide/bin/buoy

Diff for: tools/buoy/src/buoy/main.go

@@ -26,7 +26,7 @@ func main() {
 	numWorkers := flag.Int("workers", 0, "Number of Workers")
 	numServices := flag.Int("services", 0, "Number of Services")
 	dockerVersion := flag.String("docker_version", "n/a", "Docker Version")
-	flavor := flag.String("flavor", "", "IAAS Flavor (aws, azure, etc)")
+	flavor := flag.String("flavor", "", "IAAS Flavor (aws, azure, gcp, etc)")
 	swarmID := flag.String("swarm_id", "n/a", "Swarm ID")
 	nodeID := flag.String("node_id", "", "Node ID")
 	event := flag.String("event", "n/a", "Event") // identify, init, ping, scale
@@ -44,6 +44,8 @@ func main() {
 		clientCode = "0Euz80odMWb07uI6cnhFENW3ohikKpb8"
 	} else if *flavor == "azure" {
 		clientCode = "1og3BGfY1Dt2aRBSf2SQrUL2VlGBoW5v"
+	} else if *flavor == "gcp" {
+		clientCode = "9ol2zcZN0p4mEy9nuWNGysg9mrFoCqZg"
 	} else {
 		err := errors.New("unknown flavor")
 		log.Fatal(err)