Update build process

.circleci/config.yml

@@ -2,20 +2,23 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/carlpett/stream_exporter
     steps:
       - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
       - run:
           name: Build
           command: |
-            git describe --always --tags | sed -r 's/^v//' | tee VERSION
-            make build
+            make crossbuild
+            make test
+            make docker
       - store_artifacts:
-          path: .build
+          path: binaries
   docker-latest:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     steps:
       - run:
           name: Trigger Docker Hub automated build
@@ -25,33 +28,23 @@ jobs:
               https://registry.hub.docker.com/u/carlpett/stream_exporter/trigger/$DOCKER_HUB_TRIGGER_TOKEN/
   release:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/carlpett/stream_exporter
     steps:
       - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run:
-          name: Download github-release tool
-          command: |
-            curl -sL 'https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2' | \
-              tar xjf - --strip-components 3 -C /go/bin
       - run:
           name: Create release
           command: |
-            make promu
-            git describe --always --tags | sed -r 's/^v//' | tee VERSION
-            promu crossbuild tarballs
-            promu checksum .tarballs
-            promu release .tarballs
+            make crossbuild
+            make release
       - run:
           name: Trigger Docker Hub automated build
           command: |
             curl -X POST -H "Content-Type: application/json" \
               --data "{\"source_type\": \"Tag\", \"source_name\": \"$CIRCLE_TAG\"}" \
               https://registry.hub.docker.com/u/carlpett/stream_exporter/trigger/$DOCKER_HUB_TRIGGER_TOKEN/
       - store_artifacts:
-          path: .build
+          path: binaries
 
 workflows:
   version: 2

.gitignore

@@ -1 +1,2 @@
 *.exe
+binaries

Dockerfile

@@ -1,13 +1,11 @@
-FROM golang:1.8
+FROM golang:1.12
 WORKDIR /go/src/github.com/carlpett/stream_exporter/
-RUN go get -u github.com/kardianos/govendor
 COPY . .
-RUN govendor build +p
+RUN make build
 
-FROM centos:centos7
+FROM busybox:glibc
 WORKDIR /usr/bin/
 COPY --from=0 /go/src/github.com/carlpett/stream_exporter/stream_exporter /usr/bin/stream_exporter
-RUN adduser -u 1000 stream_exporter
-USER stream_exporter
+USER 1000
 ENTRYPOINT ["/usr/bin/stream_exporter"]
 EXPOSE 9178

Makefile

@@ -1,48 +1,50 @@
-GO           := go
-FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH)))
-PROMU        := $(FIRST_GOPATH)/bin/promu
-pkgs          = $(shell $(GO) list ./... | grep -v /vendor/)
+DOCKER ?= docker
 
-PREFIX                  ?= $(shell pwd)/.build
-BIN_DIR                 ?= $(shell pwd)
+CROSSBUILD_OS   = linux windows darwin
+CROSSBUILD_ARCH = 386 amd64
 
-ifdef DEBUG
-	bindata_flags = -debug
-endif
+VERSION   := $(shell git describe --tags --dirty=-dirty)
+REVISION  := $(shell git describe --abbrev=0 --always --match=always-commit-hash --dirty=-dirty)
+BRANCH    := $(shell git symbolic-ref --short HEAD)
+BUILDDATE := $(shell date --iso-8601=seconds)
+BUILDUSER ?= $(USER)
+BUILDHOST ?= $(HOSTNAME)
+LDFLAGS    = -X github.com/prometheus/common/version.Version=$(VERSION) \
+             -X github.com/prometheus/common/version.Revision=$(REVISION) \
+             -X github.com/prometheus/common/version.Branch=$(BRANCH) \
+             -X github.com/prometheus/common/version.BuildUser=$(BUILDUSER)@$(BUILDHOST) \
+             -X github.com/prometheus/common/version.BuildDate=$(BUILDDATE)
 
-all: format build
-
-style:
-	@echo ">> checking code style"
-	@! gofmt -d $(shell find . -path ./vendor -prune -o -name '*.go' -print) | grep '^'
-
-format:
-	@echo ">> formatting code"
-	@$(GO) fmt $(pkgs)
-
-vet:
-	@echo ">> vetting code"
-	@$(GO) vet $(pkgs)
+all: build test
 
 test:
 	@echo ">> testing code"
-	@$(GO) test -v $(pkgs)
+	@go test -v -cover ./...
 
-bench:
-	@$(GO) test -v -bench=. $(pkgs)
-
-build: promu
+build:
 	@echo ">> building binaries"
-	@$(PROMU) build --prefix $(PREFIX)
+	@go build -ldflags="$(LDFLAGS)"
+
+crossbuild: $(GOPATH)/bin/gox
+	@echo ">> cross-building"
+	@gox -arch="$(CROSSBUILD_ARCH)" -os="$(CROSSBUILD_OS)" -ldflags="$(LDFLAGS)" -output="binaries/stream_exporter_{{.OS}}_{{.Arch}}"
+
+release: bin/github-release
+	@echo ">> uploading release ${VERSION}"
+	@for bin in binaries/*; do \
+		./bin/github-release upload -t ${VERSION} -n $$(basename $${bin}) -f $${bin}; \
+	done
 
-tarball: promu
-	@echo ">> building release tarball"
-	@$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR)
+docker:
+	@echo ">> building docker image"
+	@$(DOCKER) build -t carlpett/stream_exporter .
 
-promu:
-	@GOOS=$(shell uname -s | tr A-Z a-z) \
-	GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
-	$(GO) get -u github.com/prometheus/promu
+$(GOPATH)/bin/gox:
+	# Need to disable modules for this to not pollute go.mod
+	@GO111MODULE=off go get -u github.com/mitchellh/gox
 
+bin/github-release:
+	@mkdir -p bin
+	@curl -sL 'https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2' | tar xjf - --strip-components 3 -C bin
 
-.PHONY: all style format build vet tarball docker promu
+.PHONY: all build crossbuild test release