Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-02-07 20:04:00 +01:00
Code Issues Projects Releases Wiki Activity

integration/tsic: add WithTailscaleRef option for building from specific git refs

Browse Source 
Add the ability to build Tailscale client containers from a specific git
ref (tag, branch, or commit hash) rather than always using HEAD. This is
needed for regression testing against specific Tailscale versions that
don't have pre-built Docker images on Docker Hub.

The implementation:
- Adds a TAILSCALE_REF build arg to Dockerfile.tailscale-HEAD
- Adds WithTailscaleRef option to tsic that sets the build arg
- Skips pre-built images when a ref is specified
- Allows ref-based builds in CI (alongside build tag exception)

Updates #1941
This commit is contained in:
Kristoffer Dalby 2026-02-03 10:22:10 +00:00
parent 46daa659e2
commit a65010d33b
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.tailscale-HEAD
View File

@ -18,6 +18,11 @@ RUN git clone https://github.com/tailscale/tailscale.git
WORKDIR /go/src/tailscale
# Optional: checkout a specific ref (tag, branch, or commit hash).
# When empty, builds from HEAD of the default branch.
ARG TAILSCALE_REF=""
RUN if [ -n "$TAILSCALE_REF" ]; then git checkout "$TAILSCALE_REF"; fi
# see build_docker.sh
ARG VERSION_LONG=""

38
integration/tsic/tsic.go
View File

@ -105,6 +105,7 @@ type TailscaleInContainer struct {
type TailscaleInContainerBuildConfig struct {
tags []string
ref string // git ref (tag, branch, commit) to checkout; empty means HEAD
}
// Option represent optional settings that can be given to a
@ -205,6 +206,19 @@ func WithBuildTag(tag string) Option {
}
}
// WithTailscaleRef sets the git ref (tag, branch, or commit hash) to checkout
// when building the Tailscale client from source. This option is only meaningful
// when invoked on HEAD versions of the client.
func WithTailscaleRef(ref string) Option {
return func(tsic *TailscaleInContainer) {
if tsic.version != VersionHead {
panic(errInvalidClientConfig)
}
tsic.buildConfig.ref = ref
}
}
// WithExtraLoginArgs adds additional arguments to the `tailscale up` command
// as part of the Login function.
func WithExtraLoginArgs(args []string) Option {
@ -398,15 +412,23 @@ func New(
// Check if a pre-built image is available via environment variable
prebuiltImage := os.Getenv("HEADSCALE_INTEGRATION_TAILSCALE_IMAGE")
// If custom build tags are required (e.g., for websocket DERP), we cannot use
// If custom build tags or a specific ref are required, we cannot use
// the pre-built image as it won't have the necessary code compiled in.
hasBuildTags := len(tsic.buildConfig.tags) > 0
hasRef := tsic.buildConfig.ref != ""
if hasBuildTags && prebuiltImage != "" {
log.Printf("Ignoring pre-built image %s because custom build tags are required: %v",
prebuiltImage, tsic.buildConfig.tags)
prebuiltImage = ""
}
if hasRef && prebuiltImage != "" {
log.Printf("Ignoring pre-built image %s because a specific ref is required: %s",
prebuiltImage, tsic.buildConfig.ref)
prebuiltImage = ""
}
if prebuiltImage != "" {
log.Printf("Using pre-built tailscale image: %s", prebuiltImage)
@ -429,8 +451,8 @@ func New(
if err != nil {
return nil, fmt.Errorf("could not run pre-built tailscale container %q: %w", prebuiltImage, err)
}
} else if util.IsCI() && !hasBuildTags {
// In CI, we require a pre-built image unless custom build tags are needed
} else if util.IsCI() && !hasBuildTags && !hasRef {
// In CI, we require a pre-built image unless custom build tags or ref are needed
return nil, errTailscaleImageRequiredInCI
} else {
buildOptions := &dockertest.BuildOptions{
@ -450,6 +472,16 @@ func New(
)
}
if tsic.buildConfig.ref != "" {
buildOptions.BuildArgs = append(
buildOptions.BuildArgs,
docker.BuildArg{
Name: "TAILSCALE_REF",
Value: tsic.buildConfig.ref,
},
)
}
container, err = pool.BuildAndRunWithBuildOptions(
buildOptions,
tailscaleOptions,