diff --git a/.travis.yml b/.travis.yml
index f05c248..433c894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - DOCKERFILE_DIR=clr-installer-ci
   - DOCKERFILE_DIR=clr-sdk
   - DOCKERFILE_DIR=elasticsearch
+  - DOCKERFILE_DIR=golang
   - DOCKERFILE_DIR=haproxy
   - DOCKERFILE_DIR=httpd
   - DOCKERFILE_DIR=machine-learning-ui
diff --git a/golang/Dockerfile b/golang/Dockerfile
new file mode 100644
index 0000000..4dbc770
--- /dev/null
+++ b/golang/Dockerfile
@@ -0,0 +1,14 @@
+FROM clearlinux:latest
+MAINTAINER qi.zheng@intel.com
+
+ARG swupd_args
+
+RUN swupd update --no-boot-update $swupd_args
+RUN swupd bundle-add go-basic $swupd_args \
+	&& rm -rf /var/lib/swupd/*
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+WORKDIR $GOPATH
diff --git a/golang/README.md b/golang/README.md
new file mode 100644
index 0000000..7a86e7c
--- /dev/null
+++ b/golang/README.md
@@ -0,0 +1,38 @@
+golang
+==========
+This provides a Clear Linux* golang instance.
+
+Build
+-----
+```
+docker build -t clearlinux/golang .
+```
+
+Or just pull it from Dockerhub
+---------------------------
+```
+docker pull clearlinux/golang
+```
+
+Test go version
+-----------------------
+```
+docker run --rm clearlinux/golang go version
+```
+
+Test go build
+---------------------
+```
+docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp clearlinux/golang go build -v
+```
+
+Details of how-to
+---------------------
+Please refer to the docker official golang image [page](https://hub.docker.com/_/golang).
+
+
+Extra Build ARGs
+----------------
+- ``swupd_args`` Specifies [SWUPD](https://github.com/clearlinux/swupd-client/blob/master/docs/swupd.1.rst#options) flags
+
+Default build args in Docker are on: https://docs.docker.com/engine/reference/builder/#arg