diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..be3ed91d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM golang:1.11.2 as builder
+COPY . /go/src/github.com/swisstxt/cloudstack-cloud-controller-manager
+WORKDIR /go/src/github.com/swisstxt/cloudstack-cloud-controller-manager
+RUN  make clean && CGO_ENABLED=0 GOOS=linux make
+
+FROM alpine:latest
+RUN apk --no-cache add ca-certificates
+WORKDIR /root/
+COPY --from=builder /go/src/github.com/swisstxt/cloudstack-cloud-controller-manager/cloudstack-ccm .
+CMD ["./cloudstack-ccm"]
diff --git a/Makefile b/Makefile
index 553239b8..f3a5b0e1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 VERSION=v0.0.1
 BUILD_DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 GIT_COMMIT=$(shell git rev-parse HEAD)
+GIT_COMMIT_SHORT=$(shell git rev-parse --short HEAD)
 GIT_VERSION=${VERSION}-master+${GIT_COMMIT}
 LDFLAGS="-X github.com/swisstxt/cloudstack-cloud-controller-manager/vendor/k8s.io/kubernetes/pkg/version.gitVersion=${GIT_VERSION} -X github.com/swisstxt/cloudstack-cloud-controller-manager/vendor/k8s.io/kubernetes/pkg/version.gitCommit=${GIT_COMMIT} -X github.com/swisstxt/cloudstack-cloud-controller-manager/vendor/k8s.io/kubernetes/pkg/version.buildDate=${BUILD_DATE}"
 
@@ -16,3 +17,6 @@ clean:
 
 cloudstack-ccm: ${CMD_SRC}
 	go build -ldflags ${LDFLAGS} -o $@ $^
+
+docker:
+	docker build . -t cloudstack-cloud-controller-manager:${GIT_COMMIT_SHORT}