Merge branch 'master' into 'master'

Support all modern SSH HostKeys in Docker image

These keys should all be available anyway, but are especially helpful
for anyone transitioning from a full system with apt/yum packages to a
container. Otherwise, users will be bothered by hostkey mismatch
warnings.

See merge request !584

CHANGELOG.md

@@ -3,6 +3,8 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+- Add support for ecdsa and ed25519 keys to Docker image
+
 8.3.1
 
 - Increase default worker memory from 250MB to 300MB.

docker/assets/sshd_config

@@ -1,6 +1,8 @@
 Port 22
 ChallengeResponseAuthentication no
 HostKey /etc/gitlab/ssh_host_rsa_key
+HostKey /etc/gitlab/ssh_host_ecdsa_key
+HostKey /etc/gitlab/ssh_host_ed25519_key
 Protocol 2
 PermitRootLogin no
 PasswordAuthentication no

docker/assets/wrapper

@@ -47,6 +47,16 @@ if [[ ! -f /etc/gitlab/ssh_host_rsa_key ]]; then
 	ssh-keygen -f /etc/gitlab/ssh_host_rsa_key -N '' -t rsa
 	chmod 0600 /etc/gitlab/ssh_host_rsa_key
 fi
+if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then
+	echo "Generating ssh_host_ecdsa_key..."
+	ssh-keygen -f /etc/gitlab/ssh_host_ecdsa_key -N '' -t ecdsa
+	chmod 0600 /etc/gitlab/ssh_host_ecdsa_key
+fi
+if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then
+	echo "Generating ssh_host_ed25519_key..."
+	ssh-keygen -f /etc/gitlab/ssh_host_ed25519_key -N '' -t ed25519
+	chmod 0600 /etc/gitlab/ssh_host_ed25519_key
+fi
 
 # Remove all services, the reconfigure will create them
 echo "Preparing services..."