diff --git a/docker-compose.yml b/docker-compose.yml
index 62faaa1fa..4e3308953 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 web:
-  build: ./docker
+  build: .
   links:
     - mysql
   ports:
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 0bc979d17..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-FROM debian:wheezy-backports
-#FROM google/golang:latest
-#RUN echo "deb http://ftp.debian.org/debian/ wheezy-backports main" >> /etc/apt/sources.list
-RUN apt-get update
-RUN apt-get install -y gcc libc6-dev make --no-install-recommends
-
-# install golang
-ENV GOLANG_VERSION 1.4.3
-RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
-        | tar -v -C /usr/src -xz
-RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1
-ENV PATH /usr/src/go/bin:$PATH
-ENV GOPATH /gopath
-
-ENV TAGS="sqlite redis memcache cert" 
-COPY  . /gopath/src/github.com/gogits/gogs/
-
-#RUN apt-cache search openssh-server
-RUN apt-get install -y openssh-server rsync
-##RUN echo "deb http://ftp.debian.org/debian/ wheezy-backports main" >> /etc/apt/sources.list \
-#    && apt-get update \
-#    && apt-get install -y -t wheezy-backports openssh-server rsync
-
-
-# set the working directory and add current stuff
-WORKDIR /gopath/src/github.com/gogits/gogs/
-RUN go get -v -tags "$TAGS"
-RUN go build -tags "$TAGS"
-
-RUN useradd --shell /bin/bash --system --comment gogits git
-
-RUN mkdir /var/run/sshd
-# SSH login fix. Otherwise user is kicked off after login
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-RUN sed 's@UsePrivilegeSeparation yes@UsePrivilegeSeparation no@' -i /etc/ssh/sshd_config
-RUN echo "export VISIBLE=now" >> /etc/profile
-RUN echo "PermitUserEnvironment yes" >> /etc/ssh/sshd_config
-
-# setup server keys on startup
-RUN sed 's@^HostKey@\#HostKey@' -i /etc/ssh/sshd_config
-RUN echo "HostKey /data/ssh/ssh_host_key" >> /etc/ssh/sshd_config
-RUN echo "HostKey /data/ssh/ssh_host_rsa_key" >> /etc/ssh/sshd_config
-RUN echo "HostKey /data/ssh/ssh_host_dsa_key" >> /etc/ssh/sshd_config
-RUN echo "HostKey /data/ssh/ssh_host_ecdsa_key" >> /etc/ssh/sshd_config
-RUN echo "HostKey /data/ssh/ssh_host_ed25519_key" >> /etc/ssh/sshd_config
-
-# prepare data
-#ENV USER="git" HOME="/home/git"
-ENV GOGS_CUSTOM /data/gogs
-RUN echo "export GOGS_CUSTOM=/data/gogs" >> /etc/profile
-
-EXPOSE 22 3000
-ENTRYPOINT []
-CMD ["./docker/start.sh"]
diff --git a/docker/README.md b/docker/README.md
index a9792da25..001b5940d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -13,13 +13,13 @@ File will store in local path: `/var/gogs`
 Directory `/var/gogs` keeps git repos and gogs data
 
     /var/gogs
-    ├── git
-    │   └── gogs-repositories
+    |── git
+    |   └── gogs-repositories
     |-- ssh
     |    `-- # ssh pub-pri keys for gogs
-    └── gogs
-        ├── conf
-        ├── data
-        ├── log
-        └── templates
+    `---- gogs
+        |── conf
+        |── data
+        |── log
+        |── templates