From 8a30420c0b6e44fb9db0049cf5b83d17cb556aba Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Fri, 22 Jul 2016 23:25:49 +0200
Subject: [PATCH] Unified README and updated badges

---
 README.md | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1064578..7165ae1 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,21 @@
 # drone-docker
 
-Drone plugin can be used to build and publish Docker images to a container registry. For the usage information and a listing of the available options please take a look at [the docs](DOCS.md).
+[![Build Status](http://beta.drone.io/api/badges/drone-plugins/drone-docker/status.svg)](http://beta.drone.io/drone-plugins/drone-docker)
+[![Go Doc](https://godoc.org/github.com/drone-plugins/drone-docker?status.svg)](http://godoc.org/github.com/drone-plugins/drone-docker)
+[![Go Report](https://goreportcard.com/badge/github.com/drone-plugins/drone-docker)](https://goreportcard.com/report/github.com/drone-plugins/drone-docker)
+[![Join the chat at https://gitter.im/drone/drone](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drone/drone)
+
+Drone plugin can be used to build and publish Docker images to a container
+registry. For the usage information and a listing of the available options
+please take a look at [the docs](DOCS.md).
 
 ## Build
 
 Build the binary with the following commands:
 
 ```
-export GO15VENDOREXPERIMENT=1
-export GOOS=linux
-export GOARCH=amd64
-export CGO_ENABLED=0
-
-go build -a -tags netgo
+go build
+go test
 ```
 
 ## Docker
@@ -20,19 +23,21 @@ go build -a -tags netgo
 Build the docker image with the following commands:
 
 ```
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo
 docker build --rm=true -t plugins/docker .
 ```
 
-Please note incorrectly building the image for the correct x64 linux and with GCO disabled will result in an error when running the Docker image:
+Please note incorrectly building the image for the correct x64 linux and with
+GCO disabled will result in an error when running the Docker image:
 
 ```
 docker: Error response from daemon: Container command
-'/go/bin/drone-docker' not found or does not exist..
+'/bin/drone-docker' not found or does not exist..
 ```
 
 ## Usage
 
-Build and publish from your current working directory:
+Execute from the working directory:
 
 ```
 docker run --rm \