From d207c3094958128e4cefce97bcf5f22e066e7f05 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 8 Nov 2022 15:09:19 +0000 Subject: [PATCH] Ensure we have ssh in container Signed-off-by: Kristoffer Dalby --- Dockerfile.tailscale | 4 +--- Dockerfile.tailscale-HEAD | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile.tailscale b/Dockerfile.tailscale index 69f6f656..fc02aeaa 100644 --- a/Dockerfile.tailscale +++ b/Dockerfile.tailscale @@ -13,9 +13,7 @@ RUN apt-get update \ RUN adduser --shell=/bin/bash ssh-it-user -RUN service ssh start - ADD integration_test/etc_embedded_derp/tls/server.crt /usr/local/share/ca-certificates/ -RUN chmod 644 /usr/local/share/ca-certificates/server.crt +RUN chmod 644 /usr/local/share/ca-certificates/server.crt RUN update-ca-certificates diff --git a/Dockerfile.tailscale-HEAD b/Dockerfile.tailscale-HEAD index 4b0eead9..c9a04189 100644 --- a/Dockerfile.tailscale-HEAD +++ b/Dockerfile.tailscale-HEAD @@ -6,8 +6,6 @@ RUN apt-get update \ RUN useradd --shell=/bin/bash --create-home ssh-it-user -RUN service ssh start - RUN git clone https://github.com/tailscale/tailscale.git WORKDIR /go/tailscale @@ -21,6 +19,6 @@ RUN cp tailscale /usr/local/bin/ RUN cp tailscaled /usr/local/bin/ ADD integration_test/etc_embedded_derp/tls/server.crt /usr/local/share/ca-certificates/ -RUN chmod 644 /usr/local/share/ca-certificates/server.crt +RUN chmod 644 /usr/local/share/ca-certificates/server.crt RUN update-ca-certificates