diff options
| author | Rowan Wookey <admin@rwky.net> | 2015-08-25 01:06:48 +0300 |
|---|---|---|
| committer | Rowan Wookey <admin@rwky.net> | 2015-08-26 14:12:43 +0300 |
| commit | 3655e433dd697998578b03dc57191a412f505f5a (patch) | |
| tree | ae31cf157c98134a2ad74b22dfbd0a5b9ffa221d | |
| parent | c52fe24c3694463c828c5efa0a38510cb8229a36 (diff) | |
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5940d586d88..7816430a208 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.0.0 (unreleased) - Search for comments should be case insensetive - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais) - Ability to search milestones + - Disabled DNS lookups for SSH in docker image (Rowan Wookey) v 7.14.1 (unreleased) - Only include base URL in OmniAuth full_host parameter (Stan Hu) diff --git a/docker/Dockerfile b/docker/Dockerfile index 05521af6963..304bb97409e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,6 +25,9 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ && ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \ && mkdir -p /var/run/sshd +# Disabling use DNS in ssh since it tends to slow connecting +RUN echo "UseDNS no" >> /etc/ssh/sshd_config + # Prepare default configuration RUN ( \ echo "" && \ |