From 0a3a6a688521d276ffa38982ca32cdfe742485b5 Mon Sep 17 00:00:00 2001
From: phcadet <phil_kd@yahoo.fr>
Date: Sat, 18 Jan 2020 14:56:46 +0100
Subject: [PATCH] Resolve ssh_key invalid

---
 Dockerfile    | 7 ++++---
 entrypoint.sh | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c8e32a..c9ebe86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ WORKDIR $WORK_PATH
 
 RUN apk update && apk add openssh && apk add autossh
 
-ARG PRIVATE_KEY
-ENV PRIVATE_KEY ${PRIVATE_KEY:-invalid}
+ARG SSH_KEY
+ENV SSH_KEY ${SSH_KEY:-invalid}
 
 ARG REMOTE_USER
 ENV REMOTE_USER ${REMOTE_USER:-root}
@@ -19,11 +19,12 @@ ARG SSH_PORT
 ENV SSH_PORT ${SSH_PORT:-22}
 
 ARG PORT
-ENV PORT ${PORT:-22}
+ENV PORT ${PORT:-localhost:22}
 
 ARG REMOTE_PORT
 ENV REMOTE_PORT ${REMOTE_PORT:-2222}
 
 COPY ./entrypoint.sh ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
 
 ENTRYPOINT './entrypoint.sh'
diff --git a/entrypoint.sh b/entrypoint.sh
index 9895845..33d66a3 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
-
-echo "${PRIVATE_KEY}" > ./id_rsa
+echo -e "${SSH_KEY}" > ./id_rsa
 chmod 600 ./id_rsa
 
-echo "Forward ssh to ${REMOTE_HOST}${REMOTE_PORT}"
+echo "Forward ssh to ${REMOTE_HOST}:${REMOTE_PORT}"
 
-/usr/bin/autossh M 0 -N -v -R '${PORT:-22}:${REMOTE_PORT:-2222}' -oServerAliveInterval=10 -oServerAliveCountMax=2 -oStrictHostKeyChecking=no -i ./id_rsa ${REMOTE_USER:-root}@${REMOTE_HOST:-localhost} -p ${SSH_PORT:-22}
+/usr/bin/autossh -M 0 -N -v -R "${REMOTE_PORT:-0.0.0.0:2222}:${PORT:-localhost:22}" -oServerAliveInterval=10 -oServerAliveCountMax=2 -oStrictHostKeyChecking=no -i ./id_rsa ${REMOTE_USER:-root}@${REMOTE_HOST:-localhost} -p ${SSH_PORT:-22}