aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author无闻 <u@gogs.io>2015-02-22 17:59:12 -0500
committer无闻 <u@gogs.io>2015-02-22 17:59:12 -0500
commite97a6ff9115ef5a3fd8c334a7f1034b84a2b30cf (patch)
tree13d78fd789ac6d6de1f1c103a3a3e910f6025e65
parent74a8bb93d84a75fae46cd40f2b670073bee5a593 (diff)
parent7d109573cbed38084ae8019c57375735d2296b56 (diff)
downloadgitea-e97a6ff9115ef5a3fd8c334a7f1034b84a2b30cf.tar.gz
gitea-e97a6ff9115ef5a3fd8c334a7f1034b84a2b30cf.zip
Merge pull request #978 from albang/dev
[docker] openssh-client provide ssh-keygen.
-rw-r--r--docker/blocks/docker_gogs/Dockerfile2
-rw-r--r--docker/blocks/docker_gogs_dev/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/blocks/docker_gogs/Dockerfile b/docker/blocks/docker_gogs/Dockerfile
index 2c98cc5011..efedc31a80 100644
--- 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
diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile
index 2a628c2d5e..ce653fbe7e 100644
--- 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