Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ff4666495
|
||
|
|
43f913cffc | ||
|
|
43698b733d | ||
|
|
ee5ca68fc3
|
||
|
|
8a550f23d8
|
||
|
|
a34f30483b | ||
|
|
26debfaf30 | ||
|
|
cae5aca3b3 | ||
|
|
cb70afb345
|
@@ -9,21 +9,24 @@
|
|||||||
# Reports pass/fail status back to Gitea, so it shows up as a required check on
|
# Reports pass/fail status back to Gitea, so it shows up as a required check on
|
||||||
# the PR.
|
# the PR.
|
||||||
|
|
||||||
# Doc-only changes can't affect the image, so they don't trigger the build.
|
# Changes that can't affect the image don't trigger the build: docs and the
|
||||||
|
# RouterOS-side script (routeros/**: lives on the router, not in the image).
|
||||||
# NOTE: if Gitea is ever configured to REQUIRE this check for merging, a
|
# NOTE: if Gitea is ever configured to REQUIRE this check for merging, a
|
||||||
# doc-only PR will have no check at all — exempt such PRs or merge manually.
|
# PR touching only excluded files will have no check at all — exempt such PRs
|
||||||
# Renovate PRs always touch the Dockerfile or pipeline files, so the
|
# or merge manually. Renovate PRs always touch the Dockerfile or pipeline
|
||||||
# automerge gate is unaffected by these exclusions.
|
# files, so the automerge gate is unaffected by these exclusions.
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
path:
|
path:
|
||||||
exclude: &doc_paths
|
exclude: &non_image_paths
|
||||||
- '**/*.md'
|
- '**/*.md'
|
||||||
- 'docs/**'
|
- 'docs/**'
|
||||||
|
- 'routeros/**'
|
||||||
|
- 'renovate.json'
|
||||||
- event: push
|
- event: push
|
||||||
branch: main
|
branch: main
|
||||||
path:
|
path:
|
||||||
exclude: *doc_paths
|
exclude: *non_image_paths
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Build all arches (no push)
|
- name: Build all arches (no push)
|
||||||
|
|||||||
@@ -13,9 +13,10 @@
|
|||||||
# unchanged, so no tag is created and nothing is released — they ride along
|
# unchanged, so no tag is created and nothing is released — they ride along
|
||||||
# with the next Tailscale bump or manual tag.
|
# with the next Tailscale bump or manual tag.
|
||||||
|
|
||||||
# Skipped for doc-only pushes: TAILSCALE_VERSION lives in the Dockerfile, so a
|
# Skipped for pushes that can't introduce a new Tailscale version:
|
||||||
# push that doesn't touch non-doc files can never introduce a new version to
|
# TAILSCALE_VERSION lives in the Dockerfile, so a push touching only docs or
|
||||||
# tag (the job would just no-op after spinning up OpenBao + git containers).
|
# the RouterOS-side script can never produce a new version to tag (the job
|
||||||
|
# would just no-op after spinning up OpenBao + git containers).
|
||||||
when:
|
when:
|
||||||
- event: push
|
- event: push
|
||||||
branch: main
|
branch: main
|
||||||
@@ -23,6 +24,8 @@ when:
|
|||||||
exclude:
|
exclude:
|
||||||
- '**/*.md'
|
- '**/*.md'
|
||||||
- 'docs/**'
|
- 'docs/**'
|
||||||
|
- 'routeros/**'
|
||||||
|
- 'renovate.json'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Get git token from OpenBao
|
- name: Get git token from OpenBao
|
||||||
|
|||||||
@@ -58,8 +58,12 @@ steps:
|
|||||||
# Use the committed renovate.json; don't open an onboarding PR.
|
# Use the committed renovate.json; don't open an onboarding PR.
|
||||||
RENOVATE_ONBOARDING: "false"
|
RENOVATE_ONBOARDING: "false"
|
||||||
RENOVATE_REQUIRE_CONFIG: "optional"
|
RENOVATE_REQUIRE_CONFIG: "optional"
|
||||||
# Git identity for the branches/commits Renovate creates.
|
# Git identity for the branches/commits Renovate creates. MUST match the
|
||||||
RENOVATE_GIT_AUTHOR: "Renovate Bot <renovate@localhost>"
|
# bot's Gitea account email: platform actions (automerge merge commits,
|
||||||
|
# "update branch") are attributed to the account email, and Renovate
|
||||||
|
# flags branches containing commits from unrecognized emails as
|
||||||
|
# "edited by someone else" and stops rebasing them.
|
||||||
|
RENOVATE_GIT_AUTHOR: "Renovate Bot <renovate@lumpiasty.xyz>"
|
||||||
# GitHub token (read-only, no repo access) lets Renovate fetch release
|
# GitHub token (read-only, no repo access) lets Renovate fetch release
|
||||||
# notes / changelogs and avoids GitHub API rate limits for the
|
# notes / changelogs and avoids GitHub API rate limits for the
|
||||||
# github-releases datasource (tailscale). Optional but recommended.
|
# github-releases datasource (tailscale). Optional but recommended.
|
||||||
|
|||||||
+44
-1
@@ -19,7 +19,7 @@
|
|||||||
# =============================================================================
|
# =============================================================================
|
||||||
# Stage 1: Build Tailscale combined binary (cross-compiled, runs natively)
|
# Stage 1: Build Tailscale combined binary (cross-compiled, runs natively)
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.26.4-alpine@sha256:a6a091eac01ceac4b97496fe2957a49b6cdd83365337d5f46f6f73710424e805 AS builder
|
FROM --platform=$BUILDPLATFORM golang:1.26.4-alpine@sha256:7a3e50096189ad57c9f9f865e7e4aa8585ed1585248513dc5cda498e2f41812c AS builder
|
||||||
|
|
||||||
# renovate: datasource=github-releases depName=tailscale packageName=tailscale/tailscale versioning=semver
|
# renovate: datasource=github-releases depName=tailscale packageName=tailscale/tailscale versioning=semver
|
||||||
ARG TAILSCALE_VERSION=v1.98.5
|
ARG TAILSCALE_VERSION=v1.98.5
|
||||||
@@ -57,6 +57,49 @@ WORKDIR /src/tailscale
|
|||||||
# disables the filter at runtime for debugging — no rebuild needed.
|
# disables the filter at runtime for debugging — no rebuild needed.
|
||||||
COPY patches/stderr_verbosity_filter.go cmd/tailscaled/
|
COPY patches/stderr_verbosity_filter.go cmd/tailscaled/
|
||||||
|
|
||||||
|
# Patch net/tstun/wrap.go: fix panic("unreachable") in invertGSOChecksum for
|
||||||
|
# ts_omit_netstack builds.
|
||||||
|
#
|
||||||
|
# invertGSOChecksum is a gVisor/GSO helper that inverts a transport-layer
|
||||||
|
# checksum before/after SNAT when gVisor hands us a segment with a partial
|
||||||
|
# checksum (NeedsCsum=true). It is only meaningful when netstack (gVisor) is
|
||||||
|
# compiled in (HasNetstack=true).
|
||||||
|
#
|
||||||
|
# The function correctly guards its body with:
|
||||||
|
# if !buildfeatures.HasNetstack { panic("unreachable") }
|
||||||
|
#
|
||||||
|
# When built with ts_omit_netstack, HasNetstack is a const false, so that guard
|
||||||
|
# evaluates to `if true { panic(...) }` — the function always panics.
|
||||||
|
#
|
||||||
|
# The problem: invertGSOChecksum is called unconditionally from injectedRead()
|
||||||
|
# (twice, around pc.snat()), even for the res.data path where res.packet==nil
|
||||||
|
# and gso is a zero-value netstack_GSO (NeedsCsum=false). The HasNetstack
|
||||||
|
# guard in the res.packet branch does NOT protect these calls.
|
||||||
|
#
|
||||||
|
# As a result, any code path that injects an outbound packet via InjectOutbound()
|
||||||
|
# — which happens when enabling exit-node use (Tailscale sends TSMP messages
|
||||||
|
# and synthesizes packets through the TUN injection path) — hits injectedRead
|
||||||
|
# with res.data!=nil, calls invertGSOChecksum, and crashes with:
|
||||||
|
# panic: unreachable
|
||||||
|
# tailscale.com/net/tstun.invertGSOChecksum(...)
|
||||||
|
# tailscale.com/net/tstun.(*Wrapper).injectedRead(...) wrap.go:1077
|
||||||
|
#
|
||||||
|
# Fix: replace the `panic("unreachable")` with a `return` in invertGSOChecksum.
|
||||||
|
# When HasNetstack=false (ts_omit_netstack), a zero-value netstack_GSO always
|
||||||
|
# has NeedsCsum=false, so the function is correctly a no-op anyway. This matches
|
||||||
|
# what the function would do if the rest of its body ran: NeedsCsum=false → return.
|
||||||
|
#
|
||||||
|
# The sed expression targets the function precisely: it matches the three-line
|
||||||
|
# sequence that opens invertGSOChecksum's HasNetstack guard, and replaces only
|
||||||
|
# the panic line with return. The pattern is stable across minor reformats
|
||||||
|
# because it anchors on the literal function comment and the specific panic string.
|
||||||
|
#
|
||||||
|
# See tailscale/tailscale issue for context (no upstream fix as of v1.98.5):
|
||||||
|
# panic happens when using exit-node via a ts_omit_netstack build.
|
||||||
|
RUN sed -i \
|
||||||
|
-e '/func invertGSOChecksum/,/^}/ s/\t\tpanic("unreachable")/\t\treturn/' \
|
||||||
|
net/tstun/wrap.go
|
||||||
|
|
||||||
# Build a minimal combined binary (tailscale CLI + tailscaled daemon in one file).
|
# Build a minimal combined binary (tailscale CLI + tailscaled daemon in one file).
|
||||||
#
|
#
|
||||||
# Tag strategy — ALLOWLIST, not blocklist:
|
# Tag strategy — ALLOWLIST, not blocklist:
|
||||||
|
|||||||
+6
-2
@@ -9,7 +9,7 @@ reasoning behind these choices, see [DESIGN.md](DESIGN.md).
|
|||||||
|
|
||||||
## Deploy on MikroTik (RouterOS)
|
## Deploy on MikroTik (RouterOS)
|
||||||
|
|
||||||
Verified on RouterOS 7.21.2 (arm64, CRS418). Commands are grouped into
|
Verified on RouterOS 7.23 (arm64, CRS418). Commands are grouped into
|
||||||
copy-paste blocks, defaults should fit most configurations.
|
copy-paste blocks, defaults should fit most configurations.
|
||||||
|
|
||||||
> Because the image has no built-in updater (the `clientupdate` feature is
|
> Because the image has no built-in updater (the `clientupdate` feature is
|
||||||
@@ -19,7 +19,9 @@ copy-paste blocks, defaults should fit most configurations.
|
|||||||
|
|
||||||
### 0. Prerequisites
|
### 0. Prerequisites
|
||||||
|
|
||||||
- RouterOS >7.13 with the **container** package installed.
|
- RouterOS >= 7.23 with the **container** package installed
|
||||||
|
(7.23 is needed for container `restart-policy`; the deploy itself works on
|
||||||
|
>= 7.13 if you drop the restart options).
|
||||||
- Container mode enabled ([documentation](https://manual.mikrotik.com/docs/System%20Information%20and%20Utilities/device-mode/#changing-mode-of-device-mode)):
|
- Container mode enabled ([documentation](https://manual.mikrotik.com/docs/System%20Information%20and%20Utilities/device-mode/#changing-mode-of-device-mode)):
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -80,6 +82,8 @@ just that directory:
|
|||||||
mountlists=tailscale_state \
|
mountlists=tailscale_state \
|
||||||
logging=yes \
|
logging=yes \
|
||||||
start-on-boot=yes \
|
start-on-boot=yes \
|
||||||
|
restart-policy=on-failure \
|
||||||
|
restart-interval=10s \
|
||||||
name=tailscale
|
name=tailscale
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
# =============================================================================
|
# =============================================================================
|
||||||
# Checks the Gitea registry for a new :stable image and, only if the published
|
# Checks the Gitea registry for a new :stable image and, only if the published
|
||||||
# image actually changed, recreates the container. Designed for RouterOS 7.x
|
# image actually changed, recreates the container. Designed for RouterOS 7.x
|
||||||
# (tested target: 7.21.2, arm64). Requires RouterOS >= 7.13 for the :deserialize
|
# (tested target: 7.23, arm64). Requires RouterOS >= 7.23 for the container
|
||||||
# command used to parse the registry token JSON.
|
# restart-policy properties (and >= 7.13 for the :deserialize command used to
|
||||||
|
# parse the registry token JSON).
|
||||||
#
|
#
|
||||||
# HOW IT DECIDES "something changed":
|
# HOW IT DECIDES "something changed":
|
||||||
# It fetches the manifest digest of the :stable tag from the registry and
|
# It fetches the manifest digest of the :stable tag from the registry and
|
||||||
@@ -59,6 +60,12 @@
|
|||||||
:local cInterface "veth-tailscale"
|
:local cInterface "veth-tailscale"
|
||||||
:local cLogging yes
|
:local cLogging yes
|
||||||
:local cStartOnBoot yes
|
:local cStartOnBoot yes
|
||||||
|
# Restart the container automatically if tailscaled crashes (tailscaled is
|
||||||
|
# PID 1; if it dies the container stops). on-failure restarts only on abnormal
|
||||||
|
# exit (a manual /container/stop stays stopped); 10s is a gentle backoff.
|
||||||
|
# Requires RouterOS >= 7.23.
|
||||||
|
:local cRestartPolicy "on-failure"
|
||||||
|
:local cRestartInterval "10s"
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
|
|
||||||
:log info "$scriptName: checking for image updates"
|
:log info "$scriptName: checking for image updates"
|
||||||
@@ -174,6 +181,8 @@
|
|||||||
mountlists=$cMountList \
|
mountlists=$cMountList \
|
||||||
logging=$cLogging \
|
logging=$cLogging \
|
||||||
start-on-boot=$cStartOnBoot \
|
start-on-boot=$cStartOnBoot \
|
||||||
|
restart-policy=$cRestartPolicy \
|
||||||
|
restart-interval=$cRestartInterval \
|
||||||
name=$cName
|
name=$cName
|
||||||
} do={
|
} do={
|
||||||
:log error "$scriptName: container add failed: $e"
|
:log error "$scriptName: container add failed: $e"
|
||||||
|
|||||||
Reference in New Issue
Block a user