diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-09 16:42:16 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-09 16:42:16 +0000 |
| commit | 3b610d98213716ae01ba9dcbc1bd76eecfaf3738 (patch) | |
| tree | 8e785203ac048b60c056d9a8a6e71dcc57503132 | |
| parent | 1ba26b4d1b4b877a689d1371fd00b5295b6ca32e (diff) | |
| parent | 3655e433dd697998578b03dc57191a412f505f5a (diff) | |
| download | gitlab-ce-3b610d98213716ae01ba9dcbc1bd76eecfaf3738.tar.gz | |
Merge branch 'issue-1952' into 'master'
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled
See merge request !1208
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 32f063fa751..c50ea05b8f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -46,6 +46,9 @@ v 8.0.0 (unreleased) v 7.14.1 - Improve abuse reports management from admin area - Fix "Reload with full diff" URL button in compare branch view (Stan Hu) + - 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) - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu) - Ability to enable SSL verification for Webhooks 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 "" && \ |