promu for build is working. Some more tests needed.

kbudde · May 20, 2016 · 7e95114 · 7e95114
1 parent 4105ea0
commit 7e95114
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 25 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+.build/
+.tarballs/
+
diff --git a/.promu.yml b/.promu.yml
@@ -3,7 +3,7 @@ verbose: true
 repository:
     path: github.com/kbudde/rabbitmq_exporter
 build:
-    flags: -a
+    flags: -a -tags netgo
     ldflags: |
         -X main.Version={{.Version}}
         -X main.Revision={{.Revision}}

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,8 @@
-FROM sdurrheimer/alpine-golang-make-onbuild
+FROM scratch
 MAINTAINER Kris Budde <Kris.Budde@gmail.com>
-EXPOSE 9090
+
+COPY rabbitmq_exporter /
+
+EXPOSE      9090
+
+CMD ["/rabbitmq_exporter"]
diff --git a/Dockerfile.scratch b/Dockerfile.scratch
diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ tarballs: promu
 	@echo ">> building crossbuild tarballs"
 	@$(PROMU) crossbuild tarballs 
 
-docker:
+docker: build
 	@echo ">> building docker image"
 	@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
 
@@ -62,7 +62,4 @@ promu:
 	        GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
 	        $(GO) get -v github.com/prometheus/promu
 
-scratch:
-	CGO_ENABLED=0 GOOS=linux $(GO) build -a -installsuffix cgo -o $(TARGET)_static && docker build -f Dockerfile.scratch -t $(TARGET):scratch .
-
-.PHONY: all style format build test vet tarball docker promu scratc
+.PHONY: all style format build test vet tarball tarballs docker promu
diff --git a/vendor/github.com/Sirupsen/logrus b/vendor/github.com/Sirupsen/logrus
diff --git a/vendor/github.com/beorn7/perks b/vendor/github.com/beorn7/perks
diff --git a/vendor/github.com/golang/protobuf b/vendor/github.com/golang/protobuf
diff --git a/vendor/github.com/matttproud/golang_protobuf_extensions b/vendor/github.com/matttproud/golang_protobuf_extensions
diff --git a/vendor/github.com/prometheus/client_golang b/vendor/github.com/prometheus/client_golang
diff --git a/vendor/github.com/prometheus/client_model b/vendor/github.com/prometheus/client_model
diff --git a/vendor/github.com/prometheus/common b/vendor/github.com/prometheus/common
diff --git a/vendor/github.com/prometheus/procfs b/vendor/github.com/prometheus/procfs
diff --git a/version.go b/version.go
@@ -2,7 +2,7 @@ package main
 
 var (
 	Version   string
-    Revision  string
+	Revision  string
 	Branch    string
 	BuildDate string
 )