MyFavMirrors
/
headscale
mirror of https://github.com/juanfont/headscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we have ssh in container 

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-11-08 15:09:19 +00:00 committed by Even Holthe
parent 93d03029e4
commit 44e37e21c2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.tailscale
View File

@ -13,9 +13,7 @@ RUN apt-get update \
RUN adduser --shell=/bin/bash ssh-it-user 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/ 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 RUN update-ca-certificates

4
Dockerfile.tailscale-HEAD
View File

@ -6,8 +6,6 @@ RUN apt-get update \
RUN useradd --shell=/bin/bash --create-home ssh-it-user RUN useradd --shell=/bin/bash --create-home ssh-it-user
RUN service ssh start
RUN git clone https://github.com/tailscale/tailscale.git RUN git clone https://github.com/tailscale/tailscale.git
WORKDIR /go/tailscale WORKDIR /go/tailscale
@ -21,6 +19,6 @@ RUN cp tailscale /usr/local/bin/
RUN cp tailscaled /usr/local/bin/ RUN cp tailscaled /usr/local/bin/
ADD integration_test/etc_embedded_derp/tls/server.crt /usr/local/share/ca-certificates/ 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 RUN update-ca-certificates