CircleCI configuration

.circleci/config.yml

@@ -0,0 +1,14 @@
+version: 2
+jobs:
+  build:
+    working_directory: /go/src/github.com/weaveworks/kured
+    docker:
+      - image: circleci/golang:1.8
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: go get github.com/golang/dep/cmd/dep
+      - run: dep ensure
+      - run: make
+      - run: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io
+      - run: make publish-image

Gopkg.lock

@@ -1,4 +1,9 @@
-memo = "758e136fb047a3fbb8746d2e83a9e11d341db8e16e4ddc78bc0e8b41038f023b"
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "758e136fb047a3fbb8746d2e83a9e11d341db8e16e4ddc78bc0e8b41038f023b"
+  solver-name = "gps-cdcl"
+  solver-version = 1
 
 [[projects]]
   name = "github.com/PuerkitoBio/purell"

Gopkg.toml

@@ -1,20 +1,20 @@
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/Sirupsen/logrus"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/prometheus/client_golang"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/prometheus/common"
 
-[[dependencies]]
+[[constraint]]
   branch = "master"
   name = "github.com/spf13/cobra"
 
-[[dependencies]]
+[[constraint]]
   name = "k8s.io/client-go"
   version = "^2.0.0"

Makefile

@@ -2,7 +2,7 @@
 .PHONY: all clean image publish-image minikube-publish
 
 DH_ORG=weaveworks
-IMAGE_TAG=latest
+VERSION=$(shell git symbolic-ref --short HEAD)-$(shell git rev-parse --short HEAD)
 
 all: image
 
@@ -14,7 +14,6 @@ clean:
 godeps=$(shell go get $1 && go list -f '{{join .Deps "\n"}}' $1 | grep -v /vendor/ | xargs go list -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}')
 
 DEPS=$(call godeps,./cmd/kured)
-VERSION=git-$(shell git rev-parse --short=12 HEAD)
 
 cmd/kured/kured: $(DEPS)
 cmd/kured/kured: cmd/kured/*.go
@@ -23,13 +22,13 @@ cmd/kured/kured: cmd/kured/*.go
 build/.image.done: cmd/kured/Dockerfile cmd/kured/kured
 	mkdir -p build
 	cp $^ build
-	sudo -E docker build -t $(DH_ORG)/kured:$(IMAGE_TAG) -f build/Dockerfile ./build
+	sudo -E docker build -t quay.io/$(DH_ORG)/kured:$(VERSION) -f build/Dockerfile ./build
 	touch $@
 
 image: build/.image.done
 
 publish-image: image
-	sudo -E docker push $(DH_ORG)/kured:$(IMAGE_TAG)
+	sudo -E docker push quay.io/$(DH_ORG)/kured:$(VERSION)
 
 minikube-publish: image
-	sudo -E docker save $(DH_ORG)/kured:$(IMAGE_TAG) | (eval $$(minikube docker-env) && docker load)
+	sudo -E docker save quay.io/$(DH_ORG)/kured:$(VERSION) | (eval $$(minikube docker-env) && docker load)