diff options
| author | Unknwon <u@gogs.io> | 2015-02-22 18:24:52 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-22 18:24:52 -0500 |
| commit | 2369881808a906f3072c935ab0575f08bd358821 (patch) | |
| tree | 39892146cf7fdc483029687e06d201b7ba66175c | |
| parent | 04164eada3bc89bb3b54aa3dea0f22203ff4aa6e (diff) | |
| parent | e97a6ff9115ef5a3fd8c334a7f1034b84a2b30cf (diff) | |
| download | gitea-2369881808a906f3072c935ab0575f08bd358821.tar.gz gitea-2369881808a906f3072c935ab0575f08bd358821.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
| -rw-r--r-- | docker/blocks/docker_gogs/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/blocks/docker_gogs_dev/Dockerfile | 2 |
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 |