From 9371fbe71a10f9449c805a1fd27968397d4f7cdb Mon Sep 17 00:00:00 2001
From: codeskyblue <codeskyblue@gmail.com>
Date: Mon, 17 Aug 2015 15:17:18 +0800
Subject: [PATCH] add docker ssh support

---
 Dockerfile       | 23 ++++-------------------
 docker/README.md | 27 +++++++++++++++++++--------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 012ceb25bc0..a6d23cfc87a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,14 @@
-#FROM debian:wheezy-backports
 FROM google/golang:latest
+MAINTAINER codeskyblue@gmail.com
+
 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" 
-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
+COPY  . /gopath/src/github.com/gogits/gogs/
 WORKDIR /gopath/src/github.com/gogits/gogs/
+
 RUN go get -v -tags "sqlite redis memcache cert"
 RUN go build -tags "sqlite redis memcache cert"
 
diff --git a/docker/README.md b/docker/README.md
index 001b5940ddf..7b75e7512ef 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,10 +2,10 @@
 
 ## Usage
 ```
-docker pull codeskyblue/docker-gogs
+docker pull gogits/gogs
 
 mkdir -p /var/gogs
-docker run --name=gogs -d -p 10022:22 -p 10080:3000 -v /var/gogs:/data codeskyblue/docker-gogs
+docker run --name=gogs -p 10022:22 -p 10080:3000 -v /var/gogs:/data gogits/gogs
 ```
 
 File will store in local path: `/var/gogs`
@@ -13,13 +13,24 @@ 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
+        |-- conf
+        |-- data
+        |-- log
+        `-- templates
 
+## SSH Support
+
+In order to support ssh, You need to change `HTTP_PORT` and `SSH_PORT` in `/var/gogs/gogs/conf/app.ini`
+
+```
+[server]
+HTTP_PORT = 3000
+SSH_PORT = 10022
+```
+
+setting description can be found in <http://gogs.io/docs/advanced/configuration_cheat_sheet.html>