ref(cache): just use go. remove bash script

Author: aledbf

cache/Dockerfile

@@ -1,32 +1,8 @@
 FROM ubuntu-debootstrap:14.04
 
-ENV DEBIAN_FRONTEND noninteractive
-
-# install common packages
-RUN apt-get update && apt-get install -y curl net-tools sudo
-
-# install etcdctl
-RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
-    && chmod +x /usr/local/bin/etcdctl
+ADD . /app
 
-# build Redis from source
-RUN buildDeps='gcc libc6-dev make'; \
-    set -x; \
-    apt-get update && apt-get install -y $buildDeps net-tools --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p /usr/src/redis \
-    && curl -sSL http://download.redis.io/releases/redis-2.8.15.tar.gz -o redis.tar.gz \
-    && echo "afc0d753cea68a26038775df2dea75a76e3d0e1d *redis.tar.gz" | sha1sum -c - \
-    && tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
-    && make -C /usr/src/redis \
-    && make -C /usr/src/redis install \
-    && rm -r redis.tar.gz /usr/src/redis \
-    && apt-get purge -y $buildDeps \
-    && apt-get autoremove -y \
-    && apt-get clean
+EXPOSE 6379
 
 WORKDIR /app
 CMD ["/app/bin/boot"]
-EXPOSE 6379
-ADD . /app
-ADD redis.conf /etc/redis/redis.conf

cache/Makefile

@@ -3,9 +3,15 @@ include ../includes.mk
 COMPONENT = cache
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+BUILD_IMAGE := $(COMPONENT)-build
 
 build: check-docker
+	docker build -t $(BUILD_IMAGE) image
+	docker cp `docker run -d $(BUILD_IMAGE)`:/usr/local/bin/redis-server bin/
+	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/boot bin/
 	docker build -t $(IMAGE) .
+	rm bin/boot
+	rm bin/redis-server
 
 clean: check-docker check-registry
 	docker rmi $(IMAGE)

cache/bin/boot

@@ -0,0 +1,9 @@
+FROM golang:1.3
+
+ADD . /go/src/github.com/deis/deis/boot
+
+RUN DOCKER_BUILD=true /go/src/github.com/deis/deis/boot/build.sh
+
+WORKDIR /go/src/github.com/deis/deis/boot
+
+RUN CGO_ENABLED=0 go get -a -ldflags '-s' github.com/deis/deis/boot

cache/image/Dockerfile

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+if [[ -z $DOCKER_BUILD ]]; then
+  echo 
+  echo "Note: this script is intended for use by the Dockerfile and not as a way to build the cache locally"
+  echo 
+  exit 1
+fi
+
+# redis to use
+REDIS=2.8.17
+SHA=913479f9d2a283bfaadd1444e17e7bab560e5d1e
+
+cd /tmp
+
+curl -sSL http://download.redis.io/releases/redis-$REDIS.tar.gz -o redis.tar.gz
+
+echo "$SHA *redis.tar.gz" | sha1sum -c -
+mkdir /usr/src/redis
+tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1
+make -C /usr/src/redis
+make -C /usr/src/redis install

cache/image/build.sh

@@ -0,0 +1,89 @@
+package main
+
+import (
+	"log"
+	"net"
+	"os"
+	"os/exec"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/coreos/go-etcd/etcd"
+)
+
+const (
+	timeout   time.Duration = 10 * time.Second
+	ttl       time.Duration = timeout * 2
+	redisWait time.Duration = 5 * time.Second
+)
+
+func main() {
+	host := getopt("HOST", "127.0.0.1")
+
+	etcdPort := getopt("ETCD_PORT", "4001")
+	etcdPath := getopt("ETCD_PATH", "/deis/cache")
+
+	externalPort := getopt("EXTERNAL_PORT", "6379")
+
+	client := etcd.NewClient([]string{"http://" + host + ":" + etcdPort})
+
+	go launchRedis()
+
+	go publishService(client, host, etcdPath, externalPort, uint64(ttl.Seconds()))
+
+	// Wait for terminating signal
+	exitChan := make(chan os.Signal, 2)
+	signal.Notify(exitChan, syscall.SIGTERM, syscall.SIGINT)
+	<-exitChan
+}
+
+func launchRedis() {
+	cmd := exec.Command("/app/bin/redis-server", "/app/redis.conf")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	err := cmd.Start()
+
+	if err != nil {
+		log.Printf("Error starting Redis: %v", err)
+		os.Exit(1)
+	}
+
+	// Wait until the redis server is available
+	for {
+		_, err := net.DialTimeout("tcp", "127.0.0.1:6379", redisWait)
+		if err == nil {
+			log.Println("deis-cache running...")
+			break
+		}
+	}
+
+	err = cmd.Wait()
+	log.Printf("Redis finished by error: %v", err)
+}
+
+func publishService(client *etcd.Client, host string, etcdPath string,
+	externalPort string, ttl uint64) {
+
+	for {
+		setEtcd(client, etcdPath+"/host", host, ttl)
+		setEtcd(client, etcdPath+"/port", externalPort, ttl)
+		time.Sleep(timeout)
+	}
+}
+
+func setEtcd(client *etcd.Client, key, value string, ttl uint64) {
+	_, err := client.Set(key, value, ttl)
+	if err != nil {
+		log.Println(err)
+	}
+}
+
+func getopt(name, dfault string) string {
+	value := os.Getenv(name)
+	if value == "" {
+		value = dfault
+	}
+	return value
+}