Merge branch 'main' of github:BTreeMap/Dockerfiles

Author: MinecraftFuns

tailscale-over-adguard-home/Dockerfile

@@ -54,7 +54,7 @@ ENV ADGUARD_CONFIG_PATH="/opt/adguardhome/conf/AdGuardHome.yaml" \
 # Environment variables for Tailscale
 ENV TAILSCALE_AUTH_KEY="" \
     TAILSCALE_HOSTNAME="" \
-    TAILSCALE_EXTRA_ARGS="" \
+    TAILSCALE_EXTRA_ARGS="--accept-dns=false --accept-routes=false" \
     TAILSCALED_EXTRA_ARGS="" \
     TAILSCALED_CUSTOM_STATE_DIR="" \
     TAILSCALE_SET_EXTRA_ARGS="--webclient"

tailscale-over-adguard-home/entrypoint.sh

@@ -43,7 +43,7 @@ echo "Starting tailscaled with arguments: $TAILSCALED_ARGS"
 sleep 5
 
 # Construct tailscale up arguments
-TAILSCALE_UP_ARGS="--accept-dns=false --accept-routes=false"
+TAILSCALE_UP_ARGS=""
 
 if [ -n "$TAILSCALE_AUTH_KEY" ]; then
     echo "Using Tailscale auth key."
@@ -60,15 +60,15 @@ if [ -n "$TAILSCALE_EXTRA_ARGS" ]; then
     TAILSCALE_UP_ARGS="$TAILSCALE_UP_ARGS ${TAILSCALE_EXTRA_ARGS}"
 fi
 
+echo "Running tailscale up with arguments: $TAILSCALE_UP_ARGS"
+/usr/local/bin/tailscale up $TAILSCALE_UP_ARGS
+
 # Run tailscale set with extra arguments
 if [ -n "$TAILSCALE_SET_EXTRA_ARGS" ]; then
     echo "Running tailscale set with arguments: $TAILSCALE_SET_EXTRA_ARGS"
     /usr/local/bin/tailscale set $TAILSCALE_SET_EXTRA_ARGS
 fi
 
-echo "Running tailscale up with arguments: $TAILSCALE_UP_ARGS"
-/usr/local/bin/tailscale up $TAILSCALE_UP_ARGS
-
 # Start AdGuard Home in the background
 ADGUARD_ARGS=""