Skip to content

Commit b93fc9e

Browse files
CI: Ubuntu 26.04 is optimized
1 parent 95336e4 commit b93fc9e

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

Dockerfile--ubuntu_26_04.tmpl

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,16 @@ ENV LANG=C.UTF-8
8484
8585
RUN chmod 700 /home/test/ && \
8686
mkdir -p /home/test/.ssh && \
87-
chown -R test:test /home/test/.ssh
87+
echo 'Host *' > /home/test/.ssh/config && \
88+
echo ' ControlMaster auto' >> /home/test/.ssh/config && \
89+
echo ' ControlPath /home/test/.ssh/master-%r@%h:%p' >> /home/test/.ssh/config && \
90+
echo ' ControlPersist 30m' >> /home/test/.ssh/config && \
91+
echo ' StrictHostKeyChecking no' >> /home/test/.ssh/config && \
92+
echo ' UserKnownHostsFile /dev/null' >> /home/test/.ssh/config && \
93+
echo ' GSSAPIAuthentication no' >> /home/test/.ssh/config && \
94+
chown -R test:test /home/test/.ssh && \
95+
chmod 700 /home/test/.ssh && \
96+
chmod 600 /home/test/.ssh/config
8897
8998
#
9099
# \"$@\"
@@ -110,11 +119,6 @@ if [ ! -f /home/test/.ssh/id_rsa ]; then \
110119
chmod 600 /home/test/.ssh/authorized_keys; \
111120
fi; \
112121
ls -la /home/test/.ssh/; \
113-
su test -c \"ssh-keyscan -H localhost >> /home/test/.ssh/known_hosts\"; \
114-
su test -c \"ssh-keyscan -H 127.0.0.1 >> /home/test/.ssh/known_hosts\"; \
115-
if [ -n \"${TEST_CFG__REMOTE_HOST:-}\" ]; then \
116-
su test -c \"ssh-keyscan -H ${TEST_CFG__REMOTE_HOST} >> /home/test/.ssh/known_hosts\"; \
117-
fi; \
118122
if [ -n \"${TEST_CFG__REMOTE_SSH_KEY:-}\" ]; then \
119123
cp \"${TEST_CFG__REMOTE_SSH_KEY}\" \"${TEST_CFG__REMOTE_SSH_KEY}_ci\"; \
120124
export TEST_CFG__REMOTE_SSH_KEY=\"${TEST_CFG__REMOTE_SSH_KEY}_ci\"; \

0 commit comments

Comments
 (0)