From d9b87f7688924afc0b7c8fb8142edf22f30b9310 Mon Sep 17 00:00:00 2001 From: James Long Date: Mon, 5 Aug 2024 19:17:12 +0100 Subject: [PATCH] Update tailscale to 1.70.0, node to 22.x, fix Docker CMD syntax --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 407f90e..9db809b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM alpine AS tailscale RUN apk add --no-cache curl ARG TARGETARCH -ARG TSVERSION=1.58.2 +ARG TSVERSION=1.70.0 RUN curl -fSsLo /tmp/tailscale.tgz https://pkgs.tailscale.com/stable/tailscale_${TSVERSION}_${TARGETARCH}.tgz \ && mkdir /out \ && tar -C /out -xzf /tmp/tailscale.tgz --strip-components=1 -FROM node:18.14-alpine AS ui-builder +FROM node:22-alpine AS ui-builder WORKDIR /app/ui # cache packages in layer COPY ui/package.json /app/ui/package.json @@ -52,5 +52,5 @@ COPY host/hostname.sh linux/hostname.sh COPY host/host-tailscale darwin/host-tailscale COPY host/host-tailscale.cmd windows/host-tailscale.cmd COPY host/host-tailscale.sh linux/host-tailscale.sh -ENV TS_HOST_ENV dde -CMD /app/tailscaled --state=/var/lib/tailscale/tailscaled.state --tun=userspace-networking +ENV TS_HOST_ENV=dde +CMD ["/app/tailscaled", "--state=/var/lib/tailscale/tailscaled.state", "--tun=userspace-networking"]