summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeaglith Ma <genedna@gmail.com>2014-04-06 17:31:42 +0800
committerMeaglith Ma <genedna@gmail.com>2014-04-06 17:31:42 +0800
commit5f4b5c1557b1f39d6bad24c5056aafa6138639e6 (patch)
treef7598939f2989fa30ac8cbe62b8b61c55f3f9e97
parent2e8d5c2eb36b63468dc78561566975c72eeaaefa (diff)
downloadgitea-5f4b5c1557b1f39d6bad24c5056aafa6138639e6.tar.gz
gitea-5f4b5c1557b1f39d6bad24c5056aafa6138639e6.zip
Temp commit
-rw-r--r--dockerfiles/images/gogits/Dockerfile4
-rw-r--r--dockerfiles/images/mysql/Dockerfile1
2 files changed, 4 insertions, 1 deletions
diff --git a/dockerfiles/images/gogits/Dockerfile b/dockerfiles/images/gogits/Dockerfile
index bcd6e69085..9c7d018b0d 100644
--- a/dockerfiles/images/gogits/Dockerfile
+++ b/dockerfiles/images/gogits/Dockerfile
@@ -13,10 +13,12 @@ RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip w
RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
-RUN go get -u github.com/gogits/gogs
+RUN http_proxy=106.187.38.45:3128 go get -u github.com/gogits/gogs
RUN cd $GOPATH/src/github.com/gogits/gogs && go build
RUN apt-get autoremove -y
RUN apt-get clean all
EXPOSE 3000
+
+CMD ["./$GOPATH/src/github.com/gogits/gogs/gogs"]
diff --git a/dockerfiles/images/mysql/Dockerfile b/dockerfiles/images/mysql/Dockerfile
index c3b85e3b94..ecf69a2c52 100644
--- a/dockerfiles/images/mysql/Dockerfile
+++ b/dockerfiles/images/mysql/Dockerfile
@@ -15,4 +15,5 @@ RUN apt-get autoremove -y
RUN apt-get clean all
EXPOSE 3306
+
CMD ["/usr/bin/mysqld_safe", "--skip-syslog", "--log-error=/dev/null"]