From 9045117301e74b8d6cbebc732bf08ed4cf4d696f Mon Sep 17 00:00:00 2001 From: DanTheMan827 <790119+DanTheMan827@users.noreply.github.com> Date: Mon, 2 Mar 2020 20:01:31 -0600 Subject: [PATCH 1/4] Disable sshd in hamachi docker --- hamachi/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hamachi/Dockerfile b/hamachi/Dockerfile index beb5afc..f8c8f88 100755 --- a/hamachi/Dockerfile +++ b/hamachi/Dockerfile @@ -29,6 +29,9 @@ RUN mkdir -p /etc/my_init.d ADD install.sh /etc/my_init.d/install.sh RUN chmod +x /etc/my_init.d/install.sh +# Disable sshd +RUN rm -r /etc/sshd + # Add hamachi.sh to runit RUN mkdir /etc/service/hamachi ADD hamachi.sh /etc/service/hamachi/run From ee3b1af168f489b84b5ca528d1b7d32cd56b614e Mon Sep 17 00:00:00 2001 From: DanTheMan827 <790119+DanTheMan827@users.noreply.github.com> Date: Mon, 2 Mar 2020 20:06:56 -0600 Subject: [PATCH 2/4] Update hamachi --- hamachi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hamachi/Dockerfile b/hamachi/Dockerfile index f8c8f88..ff2672b 100755 --- a/hamachi/Dockerfile +++ b/hamachi/Dockerfile @@ -16,7 +16,7 @@ RUN usermod -u 99 nobody && \ RUN apt-get update -q # Install Hamachi -ADD https://secure.logmein.com/labs/logmein-hamachi-2.1.0.119-x64.tgz /tmp/hamachi.tgz +ADD https://www.vpn.net/installers/logmein-hamachi-2.1.0.203-x64.tgz /tmp/hamachi.tgz RUN mkdir -p /opt/logmein-hamachi RUN tar -zxf /tmp/hamachi.tgz --strip-components 1 -C /opt/logmein-hamachi RUN ln -sf /opt/logmein-hamachi/hamachid /usr/bin/hamachi From 3229a6757d972b1def6068107e5097450212b070 Mon Sep 17 00:00:00 2001 From: DanTheMan827 <790119+DanTheMan827@users.noreply.github.com> Date: Mon, 2 Mar 2020 20:12:53 -0600 Subject: [PATCH 3/4] Update Dockerfile --- hamachi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hamachi/Dockerfile b/hamachi/Dockerfile index ff2672b..d6cbf1b 100755 --- a/hamachi/Dockerfile +++ b/hamachi/Dockerfile @@ -30,7 +30,7 @@ ADD install.sh /etc/my_init.d/install.sh RUN chmod +x /etc/my_init.d/install.sh # Disable sshd -RUN rm -r /etc/sshd +RUN rm -r /etc/services/sshd # Add hamachi.sh to runit RUN mkdir /etc/service/hamachi From 6183a781fac0cf57ce660230c45f5a717ebfac8a Mon Sep 17 00:00:00 2001 From: DanTheMan827 <790119+DanTheMan827@users.noreply.github.com> Date: Mon, 2 Mar 2020 20:19:00 -0600 Subject: [PATCH 4/4] Update Dockerfile --- hamachi/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hamachi/Dockerfile b/hamachi/Dockerfile index d6cbf1b..c16a796 100755 --- a/hamachi/Dockerfile +++ b/hamachi/Dockerfile @@ -1,7 +1,7 @@ FROM phusion/baseimage:0.9.11 MAINTAINER gfjardim ENV DEBIAN_FRONTEND noninteractive -ADD sources.list /etc/apt/sources.list +ADD hamachi/sources.list /etc/apt/sources.list # Set correct environment variables ENV HOME /root @@ -26,7 +26,7 @@ VOLUME /config # Add install.sh to execute during container startup RUN mkdir -p /etc/my_init.d -ADD install.sh /etc/my_init.d/install.sh +ADD hamachi/install.sh /etc/my_init.d/install.sh RUN chmod +x /etc/my_init.d/install.sh # Disable sshd @@ -34,5 +34,5 @@ RUN rm -r /etc/services/sshd # Add hamachi.sh to runit RUN mkdir /etc/service/hamachi -ADD hamachi.sh /etc/service/hamachi/run +ADD hamachi/hamachi.sh /etc/service/hamachi/run RUN chmod +x /etc/service/hamachi/run