diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build
new file mode 100644
index 000000000..574a26727
--- /dev/null
+++ b/docker/Dockerfile.go_build
@@ -0,0 +1,24 @@
+FROM golang:latest
+RUN go get github.com/chrislusf/seaweedfs/weed
+
+# volume server gprc port
+EXPOSE 18080
+# volume server http port
+EXPOSE 8080
+# filer server gprc port
+EXPOSE 18888
+# filer server http port
+EXPOSE 8888
+# master server shared gprc+http port
+EXPOSE 9333
+# s3 server http port
+EXPOSE 8333
+
+VOLUME /data
+
+RUN mkdir -p /etc/seaweedfs
+RUN cp /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml
+RUN cp /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 000000000..571cdcf14
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,10 @@
+# Docker
+
+## Development
+
+```
+docker build - < Dockerfile.go_build
+
+docker-compose -f docker-compose.yml up
+
+```
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index f820adfac..821967ae4 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -37,7 +37,7 @@ case "$1" in
 	;;
 
   's3')
-  	ARGS="-domainName \"$S3_DOMAIN_NAME\" -key.file \"$S3_KEY_FILE\" -cert.file \"$S3_CERT_FILE\""
+  	ARGS="-domainName='$S3_DOMAIN_NAME' -key.file='$S3_KEY_FILE' -cert.file='$S3_CERT_FILE'"
   	if [ -n "$FILER_PORT_8888_TCP_ADDR" ] ; then
 		ARGS="$ARGS -filer=$FILER_PORT_8888_TCP_ADDR:$FILER_PORT_8888_TCP_PORT"
 	fi