Merge pull request #6 from jancajthaml/feature/ci-improvements

better Makefile, shielded badges, coveralls integration

Author: jancajthaml

.circleci/config.yml

@@ -13,13 +13,17 @@ jobs:
           name: Sync dependencies
           command: |
             go get -u github.com/kardianos/govendor
+            go get -u golang.org/x/tools/cmd/cover
+            go get -u github.com/mattn/goveralls
             govendor sync -v
 
       - run:
           name: Run tests
           command: |
             cd /go/src/jancajthaml/src/datadog-mock
-            go test -v ./...
+            : > /go/src/jancajthaml/coverage.txt
+            go test -v -cover -race -coverprofile=/go/src/jancajthaml/coverage.txt -covermode=atomic ./...
+            goveralls -coverprofile=/go/src/jancajthaml/coverage.txt -service=circle-ci -repotoken=$COVERALLS_TOKEN
 
       - run:
           name: Build server
@@ -43,19 +47,18 @@ jobs:
           at: /go/src/github.com/jancajthaml
 
       - checkout
-
       - setup_remote_docker
 
       - run:
           name: Build application Docker image
           command: |
             cp -r /go/src/github.com/jancajthaml/target /app/target
-            docker build -t bundle .
-
-      - run:
-          name: List images
-          command: |
-            docker images
+            docker build \
+              --build-arg VERSION=$(cat VERSION) \
+              --build-arg VCS_REF=${CIRCLE_SHA1} \
+              --build-arg VCS_URL=$(git config --get remote.origin.url) \
+              --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+              -t bundle .
 
       - deploy:
           name: Push image to DockerHUB

Dockerfile

@@ -16,6 +16,18 @@ FROM scratch
 
 MAINTAINER Jan Cajthaml <[email protected]>
 
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="datadog-mock" \
+      org.label-schema.description="DataDog mock service Edit" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/jancajthaml/datadog-mock" \
+      org.label-schema.vendor="Jan Cajthaml" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
 COPY target/datadog_mock /datadog_mock
 
 EXPOSE 8125/UDP

ISSUE_TEMPLATE.md

@@ -1,16 +1,3 @@
-### Step 1: Are you in the right place?
-
-  * For issues or feature requests related to the code **in this repository** file a Github issue.
-  * For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/) tagged appropriately.
-
-### Step 2: Describe the problem:
-
-#### Steps to reproduce:
-
-  1. _____
-  2. _____
-  3. _____
-  
 #### Observed Results:
 
   * What happened?  This could be a description, log output, etc.

Makefile

@@ -6,6 +6,13 @@ all: install test authors run
 .PHONY: install
 install: prepare-dev lint bundle
 
+.PHONY: clean
+clean:
+	@docker images | \
+	grep -i "^datadog/dev" | \
+	awk '{ print $$3 }' | \
+	xargs -P$(CORES) -I{} docker rmi -f {} 2> /dev/null || :
+
 .PHONY: perf
 perf:
 	@./dev/siege.sh
@@ -16,7 +23,6 @@ fmt:
 
 .PHONY: sync
 sync:
-	docker-compose run --rm fetch
 	docker-compose run --rm sync
 
 .PHONY: lint

README.md

@@ -2,7 +2,8 @@
 
 datadog-mock is a golang statsd mock server listening on port 8125 and relaying events to stdout.
 
-[![Build Status](https://circleci.com/gh/jancajthaml/datadog-mock.svg?style=svg)](https://circleci.com/gh/jancajthaml/datadog-mock) [![Static Analysis](https://api.codacy.com/project/badge/Grade/c5c255a292f84cf88972f92f74f9174d)](https://www.codacy.com/app/jan-cajthaml/datadog-mock?utm_source=github.com&utm_medium=referral&utm_content=jancajthaml/datadog-mock&utm_campaign=Badge_Grade) [![Test Coverage](https://coveralls.io/repos/github/jancajthaml/datadog-mock/badge.svg?branch=master)](https://coveralls.io/github/jancajthaml/datadog-mock?branch=master)
+[![Docker Version](https://images.microbadger.com/badges/version/jancajthaml/datadog_mock.svg)](https://microbadger.com/images/jancajthaml/datadog_mock)
+[![Build Status](https://circleci.com/gh/jancajthaml/datadog-mock.svg?style=shield)](https://circleci.com/gh/jancajthaml/datadog-mock) [![Static Analysis](https://api.codacy.com/project/badge/Grade/c5c255a292f84cf88972f92f74f9174d)](https://www.codacy.com/app/jan-cajthaml/datadog-mock?utm_source=github.com&utm_medium=referral&utm_content=jancajthaml/datadog-mock&utm_campaign=Badge_Grade) [![Test Coverage](https://coveralls.io/repos/github/jancajthaml/datadog-mock/badge.svg?branch=master)](https://coveralls.io/github/jancajthaml/datadog-mock?branch=master)
 
 ## Getting started ##
 

VERSION

@@ -0,0 +1 @@
+1.0.0

docker-compose.yml

@@ -25,12 +25,6 @@ services:
     entrypoint: govendor
     command: ["sync", "-v"]
 
-  fetch:
-    extends: dev
-    image: datadog/dev:fetch
-    entrypoint: govendor
-    command: ["fetch", "github.com/ScottMansfield/nanolog"]
-
   fmt:
     extends: dev
     image: datadog/dev:fmt