Merge branch 'dev' of github.com:gogits/gogs into dev

2015-02-22 18:24:52 -05:00 · 2015-02-22 18:24:52 -05:00 · 2369881808
parent 04164eada3 e97a6ff911
commit 2369881808
2 changed files with 2 additions and 2 deletions
--- a/docker/blocks/docker_gogs/Dockerfile
+++ b/docker/blocks/docker_gogs/Dockerfile
@ -4,7 +4,7 @@ FROM ubuntu:14.04

 RUN apt-get update && apt-get install -y \
 		build-essential ca-certificates curl \
-		bzr git mercurial \
+		bzr git mercurial openssh-client\
 		--no-install-recommends

 ENV GOLANG_VERSION 1.3
--- a/docker/blocks/docker_gogs_dev/Dockerfile
+++ b/docker/blocks/docker_gogs_dev/Dockerfile
@ -5,7 +5,7 @@ FROM ubuntu:14.04
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
 		apt-get install -qy \
 		build-essential ca-certificates curl \
-		bzr git mercurial \
+		bzr git mercurial openssh-client\
 		--no-install-recommends

 ENV GOLANG_VERSION 1.3