diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux index 5d4025b89..bdf3d658f 100644 --- a/docker/Dockerfile.flux +++ b/docker/Dockerfile.flux @@ -6,7 +6,7 @@ RUN apk add --no-cache openssh ca-certificates tini 'git>=2.3.0' # Add git hosts to known hosts file so we can use # StrickHostKeyChecking with git+ssh -RUN ssh-keyscan github.com gitlab.com bitbucket.org >> /etc/ssh/ssh_known_hosts +RUN ssh-keyscan github.com gitlab.com bitbucket.org ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts # Verify newly added known_hosts (man-in-middle mitigation) ADD ./verify_known_hosts.sh /home/flux/verify_known_hosts.sh diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator index c9bcf595e..812c2fb82 100644 --- a/docker/Dockerfile.helm-operator +++ b/docker/Dockerfile.helm-operator @@ -6,7 +6,7 @@ RUN apk add --no-cache openssh ca-certificates tini 'git>=2.3.0' # Add git hosts to known hosts file so we can use # StrickHostKeyChecking with git+ssh -RUN ssh-keyscan github.com gitlab.com bitbucket.org >> /etc/ssh/ssh_known_hosts +RUN ssh-keyscan github.com gitlab.com bitbucket.org ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts # Add default SSH config, which points at the private key we'll mount COPY ./ssh_config /etc/ssh/ssh_config diff --git a/docker/verify_known_hosts.sh b/docker/verify_known_hosts.sh index 3d6022945..686b4ee47 100755 --- a/docker/verify_known_hosts.sh +++ b/docker/verify_known_hosts.sh @@ -7,7 +7,7 @@ known_hosts_file=${known_hosts_file:-/etc/ssh/ssh_known_hosts} # The heredoc below was generated by constructing a known_hosts using # -# ssh-keyscan github.com gitlab.com bitbucket.org > ./known_hosts +# ssh-keyscan github.com gitlab.com bitbucket.org ssh.dev.azure.com > ./known_hosts # # then generating the sorted fingerprints with # @@ -31,6 +31,7 @@ ssh-keygen -l -f ${known_hosts_file} | sort > "$fingerprints" diff - "$fingerprints" <