Merge pull request #10 from jancajthaml/feature/less-file-noise

Less noise files, better release lc

Author: jancajthaml

.circleci/config.yml

@@ -4,7 +4,9 @@ jobs:
   test:
     docker:
       - image: circleci/golang:1.9
-      
+        environment:
+          - LANG: C.UTF-8
+
     working_directory: /go/src/jancajthaml
     steps:
       - checkout
@@ -39,7 +41,9 @@ jobs:
 
   deploy:
     docker:
-      - image: docker:17.05.0-ce-git
+      - image: docker:17.09.0-ce-git
+        environment:
+          - LANG: C.UTF-8
 
     working_directory: /app
     steps:
@@ -54,18 +58,29 @@ jobs:
           command: |
             cp -r /go/src/github.com/jancajthaml/target /app/target
             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") \
+              --build-arg VERSION=$(git tag | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$" | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -1) \
+              --build-arg SOURCE=$(git config --get remote.origin.url) \
               -t bundle .
 
       - deploy:
           name: Push image to DockerHUB
           command: |
-            docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
-            docker tag bundle "jancajthaml/datadog_mock:${CIRCLE_SHA1}"
-            docker push "jancajthaml/datadog_mock:${CIRCLE_SHA1}"
+            docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
+
+            if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$"; then
+              VERSION=$(git tag | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$" | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -1)
+            else
+              VERSION="snapshot.${CIRCLE_SHA1}"
+            fi
+
+            docker tag bundle "jancajthaml/datadog_mock:${VERSION}"
+            docker push "jancajthaml/datadog_mock:${VERSION}"
+
+      - deploy:
+          name: Notifying microbadger to update badges
+          command: |
+            apk --no-cache add curl
+            curl -X POST https://hooks.microbadger.com/images/jancajthaml/datadog_mock/${MICROBADGER_TOKEN}
 
 workflows:
   version: 2

.env

@@ -16,17 +16,12 @@ 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"
+ARG SOURCE
+
+LABEL version=$VERSION
+LABEL description="DataDog mock server"
+LABEL source=$SOURCE
 
 COPY target/datadog_mock /datadog_mock
 

AUTHORS

@@ -1,16 +1,14 @@
 CORES := $$(getconf _NPROCESSORS_ONLN)
 
 .PHONY: all
-all: install test authors run
+all: install test run
 
 .PHONY: install
 install: prepare-dev lint bundle
 
 .PHONY: clean
 clean:
-	@docker images | \
-	grep -i "^datadog/dev" | \
-	awk '{ print $$3 }' | \
+	@docker images | grep -i "^datadog/dev" | awk '{ print $$3 }' | \
 	xargs -P$(CORES) -I{} docker rmi -f {} 2> /dev/null || :
 
 .PHONY: perf
@@ -46,7 +44,3 @@ bundle:
 .PHONY: run
 run:
 	docker-compose run --rm --no-deps --service-ports artefact
-
-.PHONY: authors
-authors:
-	@git log --format='%aN <%aE>' | sort -fu > AUTHORS

CODE_OF_CONDUCT.md

@@ -10,12 +10,10 @@ datadog-mock is a golang statsd mock server listening on port 8125 and relaying
 Bootstrap environment with `make install test` then grab `./target/datadog_mock`
 or docker image `datadog/mock`.
 
-## Usage ##
+## Testing ##
 
 Run in docker with `make run` or `./target/datadog_mock` locally.
 
-## Testing ##
-
 When datadog/mock is running you can either test simple relay
 `./dev/event-producer.sh` or siege with `make perf`.