Enable preview builds on Docker Hub

Author: Kevin Smith

.dockerignore

@@ -1,3 +1 @@
 *
-!_build/relay
-!docker/relay.conf

Dockerfile

@@ -1,11 +1,19 @@
-FROM gliderlabs/alpine:latest
+FROM alpine:3.4
 
 MAINTAINER Kevin Smith <kevin@operable.io>
 
-COPY _build/relay /usr/local/bin/relay
-COPY docker/relay.conf /usr/local/etc/relay.conf
+ARG GIT_COMMIT
+ENV GIT_COMMIT ${GIT_COMMIT:-master}
 
-# RUN chmod +x /usr/local/bin/relay
+RUN mkdir -p /root/golang/src/github.com/operable/ && \
+  cd /root/golang/src/github.com/operable && \
+  apk add -U --no-cache git go make ca-certificates && \
+  git clone https://github.com/operable/go-relay && \
+  cd go-relay && git checkout $GIT_COMMIT && \
+  GOPATH=/root/golang make exe && \
+  cp _build/relay /usr/local/bin && \
+  mkdir -p /usr/local/etc && \
+  cp docker/relay.conf /usr/local/etc/relay.conf && \
+  cd /root && rm -rf golang && \
+  apk del --force --rdepends --purge go make git && rm -rf /var/cache/apk/*
 
-# Ensure latest CA certs are available
-RUN apk-install ca-certificates && chmod +x /usr/local/bin/relay

Makefile

@@ -6,22 +6,14 @@ SOURCES           := $(shell find . -name "*.go" -type f)
 VET_FLAGS          = -v
 BUILD_STAMP       := $(shell date -u '+%Y%m%d%H%M%S')
 BUILD_HASH        := $(shell git rev-parse HEAD)
-BUILD_TAG         ?= $(shell git describe --tags)
+BUILD_TAG         ?= $(shell scripts/build_tag.sh)
 DRIVER_TAG        ?= 0.9.1
-DOCKER_IMAGE      ?= "operable/relay:dev"
+DOCKER_IMAGE      ?= "operable/relay:$(BUILD_TAG)"
 LINK_VARS         := -X main.buildstamp=$(BUILD_STAMP) -X main.buildhash=$(BUILD_HASH)
 LINK_VARS         += -X main.buildtag=$(BUILD_TAG) -X main.commanddrivertag=$(DRIVER_TAG)
-OSNAME            := $(shell uname | tr A-Z a-z)
-ARCHNAME          := $(shell $(CC) -dumpmachine | cut -d\- -f1)
 BUILD_DIR          = _build
 EXENAME            = relay
 
-ifeq ($(ARCHNAME), x86_64)
-ARCHNAME           = amd64
-endif
-TARBALL_NAME       = $(EXENAME)_$(OSNAME)_$(ARCHNAME)
-
-
 ifdef FORCE
 .PHONY: all tools lint test clean deps relay docker
 else
@@ -70,9 +62,8 @@ $(TARBALL_NAME): test exe
 	tar czf $(TARBALL_NAME).tar.gz $(TARBALL_NAME)
 	rm -rf $(TARBALL_NAME)
 
-docker: clean
-	GOOS=linux GOARCH=amd64 make deps exe
-	docker build -t $(DOCKER_IMAGE) .
+docker:
+	docker build --build-arg=GIT_COMMIT=$(BUILD_HASH) -t $(DOCKER_IMAGE) .
 
 $(BUILD_DIR):
 	mkdir -p $@

scripts/build_tag.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# git describe --tags appends SHA info to
+# prior tag. This subcommand detects when that
+# happens.
+tag=`git describe --tags`
+dash_count=`git describe --tags | grep -o - | wc -l | sed "s/ //g"`
+
+if [ "$dash_count" != "0" ]; then
+  tag="dev"
+fi
+
+echo $tag