File tree Expand file tree Collapse file tree 2 files changed +10
-0
lines changed Expand file tree Collapse file tree 2 files changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,9 @@ RUN busybox --install \
32
32
RUN rm -rf /etc/update-motd.d /etc/motd /etc/motd.dynamic
33
33
RUN ln -fs /dev/null /run/motd.dynamic
34
34
35
+ # Legacy code to be removed on 17.0. See: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7035
36
+ ENV GITLAB_ALLOW_SHA1_RSA=false
37
+
35
38
# Copy assets
36
39
COPY RELEASE /
37
40
COPY assets/ /assets/
Original file line number Diff line number Diff line change @@ -106,6 +106,13 @@ sleep 3s
106
106
# Run unclean start detection & cleanup
107
107
detect_unclean_start
108
108
109
+ # Legacy block to be removed on 17.0. See: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7035
110
+ # It re-adds support for rsa key types which was removed on 16.0 without going
111
+ # through the proper deprecation process.
112
+ if [ " ${GITLAB_ALLOW_SHA1_RSA} " == ' true' ]; then
113
+ printf ' \n# Enabled/Disabled via GITLAB_ALLOW_SHA1_RSA=[true/false]\nHostKeyAlgorithms +ssh-rsa\nPubkeyAcceptedKeyTypes +ssh-rsa' >> /assets/sshd_config
114
+ fi
115
+
109
116
# Check if this is a valid upgrade path
110
117
# If the VERSION file doesn't exist, then this is not an upgrade
111
118
if old_version=$( cat /var/opt/gitlab/gitlab-rails/VERSION)
You can’t perform that action at this time.
0 commit comments