Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

15 files changed, 14 insertions, 21 deletions

diff --git a/docker/blocks/docker_gogs/Dockerfile b/docker/blocks/docker_gogs/Dockerfile
index efedc31a..1b58fbcf 100644
--- a/docker/blocks/docker_gogs/Dockerfile
+++ b/docker/blocks/docker_gogs/Dockerfile
@@ -1,23 +1,20 @@
-FROM ubuntu:14.04
+FROM buildpack-deps:trusty-scm
 
 # This part is taken from the official docker image --------------------
 
 RUN apt-get update && apt-get install -y \
-		build-essential ca-certificates curl \
-		bzr git mercurial openssh-client\
-		--no-install-recommends
+		build-essential --no-install-recommends
 
 ENV GOLANG_VERSION 1.3
 
-RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
-	| tar -v -C /usr/src -xz
-WORKDIR /usr/src/go
+RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
+		| tar -v -C /usr/src -xz
 
-RUN cd src && ./make.bash --no-clean 2>&1
+RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1
 
 ENV PATH /usr/src/go/bin:$PATH
 
-RUN mkdir -p /go/src
+RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 WORKDIR /go
diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile
index ce653fbe..a51d165e 100644
--- a/docker/blocks/docker_gogs_dev/Dockerfile
+++ b/docker/blocks/docker_gogs_dev/Dockerfile
@@ -1,24 +1,20 @@
-FROM ubuntu:14.04
+FROM buildpack-deps:trusty-scm
 
-# This part is derived from the official docker image ------------------
+# This part is taken from the official docker image --------------------
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-		apt-get install -qy \
-		build-essential ca-certificates curl \
-		bzr git mercurial openssh-client\
-		--no-install-recommends
+RUN apt-get update && apt-get install -y \
+		build-essential --no-install-recommends
 
 ENV GOLANG_VERSION 1.3
 
-RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
-	| tar -v -C /usr/src -xz
-WORKDIR /usr/src/go
+RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
+		| tar -v -C /usr/src -xz
 
-RUN cd src && ./make.bash --no-clean 2>&1
+RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1
 
 ENV PATH /usr/src/go/bin:$PATH
 
-RUN mkdir -p /go/src
+RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 WORKDIR /go
diff --git a/docker/blocks/option_cache_memcache/fig b/docker/blocks/option_cache_memcache/docker-compose
index 80d0215c..80d0215c 100644
--- a/docker/blocks/option_cache_memcache/fig
+++ b/docker/blocks/option_cache_memcache/docker-compose
diff --git a/docker/blocks/option_cache_redis/fig b/docker/blocks/option_cache_redis/docker-compose
index 0e74bc4a..0e74bc4a 100644
--- a/docker/blocks/option_cache_redis/fig
+++ b/docker/blocks/option_cache_redis/docker-compose
diff --git a/docker/blocks/option_db_mysql/fig b/docker/blocks/option_db_mysql/docker-compose
index a005a059..a005a059 100644
--- a/docker/blocks/option_db_mysql/fig
+++ b/docker/blocks/option_db_mysql/docker-compose
diff --git a/docker/blocks/option_db_postgresql/fig b/docker/blocks/option_db_postgresql/docker-compose
index c839e904..c839e904 100644
--- a/docker/blocks/option_db_postgresql/fig
+++ b/docker/blocks/option_db_postgresql/docker-compose
diff --git a/docker/blocks/option_session_mysql/fig b/docker/blocks/option_session_mysql/docker-compose
index 0e2dbf19..0e2dbf19 100644
--- a/docker/blocks/option_session_mysql/fig
+++ b/docker/blocks/option_session_mysql/docker-compose
diff --git a/docker/blocks/w_cache/fig b/docker/blocks/w_cache/docker-compose
index fd66c357..fd66c357 100644
--- a/docker/blocks/w_cache/fig
+++ b/docker/blocks/w_cache/docker-compose
diff --git a/docker/blocks/w_cache_session/fig b/docker/blocks/w_cache_session/docker-compose
index 0f901140..0f901140 100644
--- a/docker/blocks/w_cache_session/fig
+++ b/docker/blocks/w_cache_session/docker-compose
diff --git a/docker/blocks/w_db/fig b/docker/blocks/w_db/docker-compose
index a7e9c1b6..a7e9c1b6 100644
--- a/docker/blocks/w_db/fig
+++ b/docker/blocks/w_db/docker-compose
diff --git a/docker/blocks/w_db_cache/fig b/docker/blocks/w_db_cache/docker-compose
index 42402e40..42402e40 100644
--- a/docker/blocks/w_db_cache/fig
+++ b/docker/blocks/w_db_cache/docker-compose
diff --git a/docker/blocks/w_db_cache_session/fig b/docker/blocks/w_db_cache_session/docker-compose
index 42444405..42444405 100644
--- a/docker/blocks/w_db_cache_session/fig
+++ b/docker/blocks/w_db_cache_session/docker-compose
diff --git a/docker/blocks/w_db_session/fig b/docker/blocks/w_db_session/docker-compose
index 3703c6ba..3703c6ba 100644
--- a/docker/blocks/w_db_session/fig
+++ b/docker/blocks/w_db_session/docker-compose
diff --git a/docker/blocks/w_none/fig b/docker/blocks/w_none/docker-compose
index c0fed209..c0fed209 100644
--- a/docker/blocks/w_none/fig
+++ b/docker/blocks/w_none/docker-compose
diff --git a/docker/blocks/w_session/fig b/docker/blocks/w_session/docker-compose
index 7dda0dde..7dda0dde 100644
--- a/docker/blocks/w_session/fig
+++ b/docker/blocks/w_session/docker-compose