Skip to content

Commit

Permalink
rework docker tags (#1763)
Browse files Browse the repository at this point in the history
* rework docker tags

This commit tries to align the new docker tags with the old schema

A prerelease will end up with the following tags:

- unstable
- v0.23.0-alpha3
- 0.23.0.alpha3
- sha-1234adsfg

A release will end up with:

- latest
- stable
- v0.23.0
- v0.23
- v0
- 0.23.0
- 0.23
- 0
- sha-1234adsfg

All of the builds will also have a `-debug` version.

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* update changelog

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

---------

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
  • Loading branch information
kradalby committed Feb 17, 2024
1 parent 1b01b9e commit 1904d79
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 21 deletions.
57 changes: 36 additions & 21 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,17 @@ kos:
- linux/arm64
- linux/arm/v7
tags:
- latest
- "{{ if not .Prerelease }}latest{{ end }}"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}"
- "{{ if not .Prerelease }}{{ .Major }}"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}"
- "{{ if not .Prerelease }}v{{ .Major }}"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"
- "{{ .Tag }}"
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ .Major }}.{{ .Minor }}"
- "{{ .Major }}"
- '{{ trimprefix .Tag "v" }}'
- "sha-{{ .ShortCommit }}"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"

- id: dockerhub
build: headscale
Expand All @@ -116,14 +120,17 @@ kos:
- linux/arm64
- linux/arm/v7
tags:
- latest
- "{{ if not .Prerelease }}latest{{ end }}"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}"
- "{{ if not .Prerelease }}{{ .Major }}"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}"
- "{{ if not .Prerelease }}v{{ .Major }}"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"
- "{{ .Tag }}"
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "{{ .Major }}.{{ .Minor }}"
- "{{ .Major }}"
- '{{ trimprefix .Tag "v" }}'
- "sha-{{ .ShortCommit }}"
- "{{ if not .Prerelease }}stable{{ end }}"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}"

- id: ghcr-debug
repository: ghcr.io/juanfont/headscale
Expand All @@ -139,13 +146,17 @@ kos:
- linux/arm64
- linux/arm/v7
tags:
- latest
- "{{ if not .Prerelease }}latest{{ end }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}-debug"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}-debug"
- "{{ .Tag }}-debug"
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ .Major }}.{{ .Minor }}-debug"
- "{{ .Major }}-debug"
- '{{ trimprefix .Tag "v" }}-debug'
- "sha-{{ .ShortCommit }}-debug"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}-debug"

- id: dockerhub-debug
build: headscale
Expand All @@ -158,13 +169,17 @@ kos:
- linux/arm64
- linux/arm/v7
tags:
- latest
- "{{ if not .Prerelease }}latest{{ end }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}.{{ .Minor }}-debug"
- "{{ if not .Prerelease }}{{ .Major }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}.{{ .Minor }}-debug"
- "{{ if not .Prerelease }}v{{ .Major }}-debug"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}-debug"
- "{{ .Tag }}-debug"
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}-debug"
- "{{ .Major }}.{{ .Minor }}-debug"
- "{{ .Major }}-debug"
- '{{ trimprefix .Tag "v" }}-debug'
- "sha-{{ .ShortCommit }}-debug"
- "{{ if not .Prerelease }}stable{{ else }}unstable{{ end }}-debug"

checksum:
name_template: "checksums.txt"
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ after improving the test harness as part of adopting [#1460](https://github.com/
- If no DERP is configured, the server will fail to start, this can be because it cannot load the DERPMap from file or url.
- Embedded DERP server requires a private key [#1611](https://github.com/juanfont/headscale/pull/1611)
- Add a filepath entry to [`derp.server.private_key_path`](https://github.com/juanfont/headscale/blob/b35993981297e18393706b2c963d6db882bba6aa/config-example.yaml#L95)
- Docker images are now built with goreleaser (ko) [#1716](https://github.com/juanfont/headscale/pull/1716) [#1763](https://github.com/juanfont/headscale/pull/1763)
- Entrypoint of container image has changed from shell to headscale, require change from `headscale serve` to `serve`

### Changes

Expand Down

0 comments on commit 1904d79

Please sign in to comment.