From 46f821f88c68521d503be01c5f64b2263093c6f7 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Sat, 10 Aug 2019 21:37:51 -0400 Subject: [PATCH] Docker image use environement variables to get their settings --- Dockerfile | 8 ++++++-- Dockerfile.dev | 9 ++++++--- docker-entrypoint.sh | 8 ++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100755 docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index a2212455..400a98d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,9 @@ RUN set -ex; \ rm -rf /src; \ apk del .build-deps -EXPOSE 22 -ENTRYPOINT ["tmate-ssh-server"] +# TODO not run as root. Instead, use capabilities. + +COPY docker-entrypoint.sh /usr/local/bin + +EXPOSE 2200 +ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile.dev b/Dockerfile.dev index 8d9bbbd4..947bd717 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -23,7 +23,10 @@ COPY . . RUN set -ex; \ ./autogen.sh; \ ./configure --prefix=/usr CFLAGS="-D_GNU_SOURCE"; \ - make -j "$(nproc)" + make -j "$(nproc)"; \ + ln -s /src/tmate-ssh-server/tmate-ssh-server /usr/bin -EXPOSE 22 -ENTRYPOINT ["/src/tmate-ssh-server/tmate-ssh-server"] +COPY docker-entrypoint.sh /usr/local/bin + +EXPOSE 2200 +ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 00000000..c91b1c13 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${USE_PROXY}" == "1" ]; then + exec tmate-ssh-server -p 2200 -k ${SSH_KEYS_PATH} -h ${SSH_HOSTNAME} -x localhost +else + exec tmate-ssh-server -p 2200 -k ${SSH_KEYS_PATH} -h ${SSH_HOSTNAME} +fi