Refactor image builds

Dockerfile

@@ -1,10 +1,8 @@
-FROM debian:9.9-slim
-
-EXPOSE 9436
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_amd64 /app/mikrotik-exporter
-
-RUN chmod 755 /app/*
-
-ENTRYPOINT ["/app/start.sh"]
+FROM golang:1.13 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build
+
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]

Dockerfile.arm64

@@ -1,8 +1,8 @@
-FROM arm64v8/busybox:1.31.0
+FROM golang:1.13 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build
 
-EXPOSE 9090
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_arm64 /app/mikrotik-exporter
-
-ENTRYPOINT ["/app/start.sh"]
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]

Dockerfile.armhf

@@ -1,10 +1,8 @@
-FROM arm32v7/busybox:1.27.2
-
-EXPOSE 9090
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_arm /app/mikrotik-exporter
-
-RUN chmod 755 /app/*
-
-ENTRYPOINT ["/app/start.sh"]
+FROM golang:1.13 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm go build
+
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]

Makefile

@@ -17,7 +17,7 @@ deploy: utils
 	CGO_ENABLED=0 gox -os="linux freebsd netbsd" -arch="amd64 arm arm64 386" -parallel=4 -ldflags "$(LDFLAGS)" -output "dist/mikrotik-exporter_{{.OS}}_{{.Arch}}"
 	@ghr -t $(GITHUB_TOKEN) -u $(CIRCLE_PROJECT_USERNAME) -r $(CIRCLE_PROJECT_REPONAME) -replace $(VERSION) dist/
 
-dockerhub: deploy
+dockerhub:
 	@docker login -u $(DOCKER_USER) -p $(DOCKER_PASS)
 	docker build -t $(CIRCLE_PROJECT_USERNAME)/$(CIRCLE_PROJECT_REPONAME):$(VERSION) .
 	docker push $(CIRCLE_PROJECT_USERNAME)/$(CIRCLE_PROJECT_REPONAME):$(VERSION)