Go 1.9, Ubuntu 16 for the container

Just making everything a little bit better.

Author: bobveznat

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:15.10
+FROM ubuntu:16.04
 MAINTAINER Bob Van Zant <bob@veznat.com>
 LABEL Description="ssh-cert-authority"
 RUN apt-get update && apt-get install -y openssh-client && apt-get clean && rm -rf /var/lib/apt

Dockerfile-buildenv

@@ -1,4 +1,4 @@
-FROM ubuntu:15.10
+FROM ubuntu:16.04
 MAINTAINER Bob Van Zant <bob@veznat.com>
 LABEL Description="up-to-date ubuntu environment" Vendor="Cloudtools"
 
@@ -12,18 +12,20 @@ RUN apt-get update && \
 
 LABEL Description="up-to-date golang environment"
 
-RUN mkdir -p /build
-RUN curl -O https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.7.linux-amd64.tar.gz
+RUN mkdir -p /build  \
+    && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz \
+    && echo "d70eadefce8e160638a9a6db97f7192d8463069ab33138893ad3bf31b0650a79 go1.9.linux-amd64.tar.gz" | sha256sum -c - \
+    && tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz \
+    && rm -f go1.9.linux-amd64.tar.gz
 
 ENV GOROOT_BOOTSTRAP=/usr/local/go
 ENV GOROOT=/build/go-build/go
 ENV PATH=/build/go-build/go/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/go/bin
 
 RUN mkdir -p /build/go-build \
     && cd /build/go-build \
-    && curl -o go.tar.gz -s https://storage.googleapis.com/golang/go1.7.src.tar.gz \
-    && echo "ca53aca78b60a7b3168a3e3df5a08546a634d043 go.tar.gz" | sha1sum -c - \
+    && curl -o go.tar.gz -s https://storage.googleapis.com/golang/go1.9.src.tar.gz \
+    && echo "a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 go.tar.gz" | sha256sum -c - \
     && tar -zxf go.tar.gz \
     && cd /build/go-build/go/src \
     && GOOS=darwin GOARCH=amd64 ./make.bash --no-clean 2>&1 > /dev/null ;

Makefile

@@ -3,11 +3,30 @@ VERSION := $(shell echo `git describe --tags --long --match=*.*.* --dirty` | sed
 
 PKG=github.com/cloudtools/ssh-cert-authority
 
+.PHONY: test vet
+
+ssh-cert-authority:
+	go build -ldflags "-X ${PKG}/version.Tag=${TAG} -X ${PKG}/version.BuildVersion=${VERSION}" .
+
+ssh-cert-authority-linux-amd64:
+	GOOS=linux GOARCH=amd64 \
+		 go build -o ssh-cert-authority-linux-amd64 \
+		 	-ldflags "-X ${PKG}/version.Tag=${TAG} -X ${PKG}/version.BuildVersion=${VERSION}" .
+
+ssh-cert-authority-linux-amd64.gz: ssh-cert-authority-linux-amd64
+	gzip -f ssh-cert-authority-linux-amd64
+
+ssh-cert-authority-darwin-amd64:
+	GOOS=darwin GOARCH=amd64 \
+		 go build -o ssh-cert-authority-darwin-amd64 \
+		 	-ldflags "-X ${PKG}/version.Tag=${TAG} -X ${PKG}/version.BuildVersion=${VERSION}" .
+
+ssh-cert-authority-darwin-amd64.gz: ssh-cert-authority-darwin-amd64
+	gzip -f ssh-cert-authority-darwin-amd64
+
 test:
-	go test ./...
+	@go test ./...
 
 vet:
-	go vet ./...
+	@go vet ./...
 
-all: test
-	go build -ldflags "-X ${PKG}/version.Tag=${TAG} -X ${PKG}/version.BuildVersion=${VERSION}" .

build.sh

@@ -1,13 +1,5 @@
 #!/bin/bash -e
 
 go get
-go test ./...
+make test ssh-cert-authority-linux-amd64.gz ssh-cert-authority-darwin-amd64.gz
 
-ARCHITECTURES=amd64
-OPERATING_SYSTEMS="linux darwin"
-for GOARCH in $ARCHITECTURES; do
-    for GOOS in $OPERATING_SYSTEMS; do
-        GOOS=$GOOS GOARCH=$GOARCH go build -o ssh-cert-authority-$GOOS-$GOARCH
-        gzip -f ssh-cert-authority-$GOOS-$GOARCH
-    done
-done