A little clean up, re-enabled musl for amd64 builds, and built 1.10.4 and 1.11.1

Author: brimstone

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11
+FROM debian:stretch
 
 SHELL ["/bin/bash", "-uec"]
 
@@ -11,6 +11,7 @@ RUN dpkg --add-architecture i386 \
     mingw-w64 \
     clang \
     m4 file \
+    wget git \
  && apt clean \
  && rm -rf /var/lib/apt/lists
 
@@ -122,11 +123,35 @@ RUN wget http://ftp.gnu.org/gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 \
  && popd \
  && rm -rf gcc*
 
+ARG VERSION
 ENV TAR="" \
     VERBOSE="" \
     LDFLAGS="" \
     GOARCH="amd64" \
-    GOOS="linux"
+    GOOS="linux" \
+    GOLANG_VERSION="${VERSION}"
+
+RUN case "${GOLANG_VERSION}" in \
+		1.10.4) goRelArch='linux-amd64'; goRelSha256='fa04efdb17a275a0c6e137f969a1c4eb878939e91e1da16060ce42f02c2ec5ec' ;; \
+		1.11.1) goRelArch='linux-amd64'; goRelSha256='2871270d8ff0c8c69f161aaae42f9f28739855ff5c5204752a8d92a1c9f63993' ;; \
+		*) \
+			echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
+	esac; \
+	\
+	url="https://golang.org/dl/go${GOLANG_VERSION}.${goRelArch}.tar.gz"; \
+	wget -O go.tgz "$url"; \
+	echo "${goRelSha256} *go.tgz" | sha256sum -c -; \
+	tar -C /usr/local -xzf go.tgz; \
+	rm go.tgz; \
+	\
+	export PATH="/usr/local/go/bin:$PATH"; \
+	go version
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+WORKDIR $GOPATH
 
 COPY loader /loader
 
@@ -136,8 +161,6 @@ ENTRYPOINT [ "/loader" ]
 
 ARG BUILD_DATE
 ARG VCS_REF
-# no effect here
-#ARG blah
 
 LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.vcs-url="https://github.com/brimstone/docker-golang" \

Makefile

@@ -1,5 +1,3 @@
-export IMAGE_NAME ?= brimstone/golang:latest
-
 .PHONY: image
 image:
 	hooks/build
@@ -8,6 +6,7 @@ image:
 clean:
 	-docker rmi golang-test-nocgo-onbuild
 	-docker rmi golang-test-cgo-onbuild
+	-rm -rf *.results
 
 .PHONY: test
 test:

hooks/build

@@ -1,6 +1,11 @@
 #!/bin/bash
+set -euo pipefail
 
+IMAGE_NAME=brimstone/golang
+for v in $(awk '/goRelArch=/{gsub(")","",$1);print $1}' Dockerfile); do
 # stolen from https://medium.com/microscaling-systems/labelling-automated-builds-on-docker-hub-f3d073fb8e1
-docker build --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
-             --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
-             -t "$IMAGE_NAME" .
+	docker build --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
+				--build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+				--build-arg VERSION=$v \
+				-t "$IMAGE_NAME:$v" .
+done

loader

@@ -7,8 +7,8 @@ if [ "${GOOS}" = "linux" ]; then
 	if [ "${GOARCH}" = "arm" ]; then
 		export CC=arm-linux-gnueabihf-gcc-6
 		export CXX=arm-linux-gnueabihf-g++-6
-	#elif [ "${GOARCH}" = "amd64" ]; then
-		#export CC=/usr/local/musl/bin/musl-gcc
+	elif [ "${GOARCH}" = "amd64" ]; then
+		export CC=/usr/local/musl/bin/musl-gcc
 	fi
 elif [ "${GOOS}" = "windows" ]; then
 	LDFLAGS="-s -w"