Merge pull request #7952 from madhavajay/madhava/headscale_dockerfile2

Cleanup headscale dockerfile

packages/grid/vpn/headscale.dockerfile

@@ -23,13 +23,10 @@ RUN curl -o /usr/local/bin/waitforit -sSL https://github.com/maxcnunes/waitforit
   chmod +x /usr/local/bin/waitforit
 
 ENV HEADSCALE_VERSION="0.22.3"
-RUN --mount=type=cache,target=/root/.cache if [ $(uname -m) != "x86_64" ]; then \
-  curl -o /bin/headscale -sSL "https://github.com/juanfont/headscale/releases/download/v${HEADSCALE_VERSION}/headscale_${HEADSCALE_VERSION}_linux_arm64"; \
-  fi
-
-RUN --mount=type=cache,target=/root/.cache if [ $(uname -m) == "x86_64" ]; then \
-  curl -o /bin/headscale -sSL "https://github.com/juanfont/headscale/releases/download/v${HEADSCALE_VERSION}/headscale_${HEADSCALE_VERSION}_linux_amd64"; \
-  fi
+ENV GITHUB_URL="https://github.com/juanfont/headscale/releases/download"
+ENV HEADSCALE_URL="${GITHUB_URL}/v${HEADSCALE_VERSION}/headscale_${HEADSCALE_VERSION}_linux"
+RUN [ $(uname -m) != "x86_64" ] && curl -o /bin/headscale -sSL "${HEADSCALE_URL}_arm64" || true
+RUN [ $(uname -m) == "x86_64" ] && curl -o /bin/headscale -sSL "${HEADSCALE_URL}_amd64" || true
 
 RUN chmod +x /bin/headscale
 

packages/grid/vpn/headscale.sh

@@ -7,18 +7,11 @@ export NETWORK_NAME="${1}"
 # start server in background
 headscale serve&
 
-# Wait for headscale to start
+# wait for headscale to start
 waitforit -address=http://localhost:8080/health -status=200 -timeout=60 -- echo "server started"
 
 # create users
 headscale users create $NETWORK_NAME || true
 
-#
-# headscale -u omnet preauthkeys create -o json
-
-# kill background process
-# pgrep headscale | xargs kill -9
-
-# # start in foreground
-# headscale serve
-flask run -p 4000 --host=0.0.0.0
+# run api
+flask run -p 4000 --host=0.0.0.0