From d057cca349a2f7b7a9a91a897e4aeb3ef0672e7a Mon Sep 17 00:00:00 2001 From: Varac Date: Tue, 16 Oct 2018 23:59:59 +0200 Subject: [PATCH 1/3] Use libssh 0.7.6 Latest libssh requires cmake >= 3.3.0 which is not available in jessie. jessie-backports provides 3.6.2 but this pulls too many dependencies in. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03da7062..18c2a34f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,9 @@ RUN apt-get install -y git build-essential automake cmake pkg-config libssl-dev && rm -rf /var/lib/apt/lists/* RUN mkdir /src && cd /src/ &&\ - git clone git://git.libssh.org/projects/libssh.git &&\ + # Latest libssh requires cmake >= 3.3.0 which is not available in jessie. + # jessie-backports provides 3.6.2 but this pulls too many dependencies in. + git clone -b libssh-0.7.6 git://git.libssh.org/projects/libssh.git &&\ git clone https://github.com/msgpack/msgpack-c.git &&\ git clone https://github.com/digitalautonomy/tmate-slave.git From 23c96e3d81d704835112a6d853794d50834b7ebe Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 17 Oct 2018 00:39:49 +0200 Subject: [PATCH 2/3] Use upstream tmate-slave in docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18c2a34f..03e6d7a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir /src && cd /src/ &&\ # jessie-backports provides 3.6.2 but this pulls too many dependencies in. git clone -b libssh-0.7.6 git://git.libssh.org/projects/libssh.git &&\ git clone https://github.com/msgpack/msgpack-c.git &&\ - git clone https://github.com/digitalautonomy/tmate-slave.git + git clone https://github.com/tmate-io/tmate-slave.git RUN cd /src/libssh &&\ mkdir build && cd build && cmake .. && make install From 57529a2d182be80b624a92bb034ede7166d2b7a8 Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 17 Oct 2018 00:49:18 +0200 Subject: [PATCH 3/3] Remove build dependencies in docker image --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 03e6d7a0..e797e33b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,4 +52,8 @@ RUN cd /src/tmate-slave &&\ RUN cp /src/tmate-slave/tmate-slave /sbin/ +# Clean up +RUN rm -rf /src +RUN apt-get --auto-remove purge -y git build-essential automake cmake pkg-config libssl-dev zlib1g-dev libncurses5-dev + ENV LD_LIBRARY_PATH=/usr/local/lib