From 1e2e5e16c1c52e935bba5bea8738c3323dd7df03 Mon Sep 17 00:00:00 2001 From: Jaeho Shin Date: Tue, 24 Jan 2017 06:42:04 -0800 Subject: [PATCH 1/2] Fixes tini path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09e82d4..8bf3f66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ RUN mkdir /root/.ssh && \ COPY ssh-find-agent.sh /root/ssh-find-agent.sh EXPOSE 22 VOLUME ["/root/.ssh/authorized_keys"] -ENTRYPOINT ["/usr/bin/tini","--"] +ENTRYPOINT ["/sbin/tini","--"] CMD ["/usr/sbin/sshd","-D"] From e565e45ab9b72c421560628463b4d4446c74ec69 Mon Sep 17 00:00:00 2001 From: Jaeho Shin Date: Tue, 24 Jan 2017 06:42:20 -0800 Subject: [PATCH 2/2] Ensures ssh uses no connection sharing (`-S none`) --- pinata-ssh-forward.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinata-ssh-forward.sh b/pinata-ssh-forward.sh index 4b236d4..9f9a738 100755 --- a/pinata-ssh-forward.sh +++ b/pinata-ssh-forward.sh @@ -18,7 +18,7 @@ IP=`docker inspect --format '{{(index (index .NetworkSettings.Ports "22/tcp") 0) ssh-keyscan -p ${LOCAL_PORT} ${IP} > ${LOCAL_STATE}/known_hosts 2>/dev/null ssh -f -o "UserKnownHostsFile=${LOCAL_STATE}/known_hosts" \ - -A -p ${LOCAL_PORT} root@${IP} \ + -A -S none -p ${LOCAL_PORT} root@${IP} \ /root/ssh-find-agent.sh echo 'Agent forwarding successfully started.'