MyFavMirrors
/
headscale
mirror of https://github.com/juanfont/headscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into bump-tailscale-v1.30

This commit is contained in:
Juan Font Alonso 2022-09-03 16:20:25 +02:00
parent d5cc5b2bc8 24bafdf2bb
commit d29411408b
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.18.0 go-version: 1.19.0
- name: Install dependencies - name: Install dependencies
run: | run: |

2
.goreleaser.yml
View File

@ -1,7 +1,7 @@
--- ---
before: before:
hooks: hooks:
- go mod tidy -compat=1.18 - go mod tidy -compat=1.19
release: release:
prerelease: auto prerelease: auto

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
- Added support for Tailscale TS2021 protocol [#738](https://github.com/juanfont/headscale/pull/738) - Added support for Tailscale TS2021 protocol [#738](https://github.com/juanfont/headscale/pull/738)
- Add ability to specify config location via env var `HEADSCALE_CONFIG` [#674](https://github.com/juanfont/headscale/issues/674) - Add ability to specify config location via env var `HEADSCALE_CONFIG` [#674](https://github.com/juanfont/headscale/issues/674)
- Target Go 1.19 for Headscale [#778](https://github.com/juanfont/headscale/pull/778)
## 0.16.4 (2022-08-21) ## 0.16.4 (2022-08-21)

2
Dockerfile
View File

@ -1,5 +1,5 @@
# Builder image # Builder image
FROM docker.io/golang:1.18.0-bullseye AS build FROM docker.io/golang:1.19.0-bullseye AS build
ARG VERSION=dev ARG VERSION=dev
ENV GOPATH /go ENV GOPATH /go
WORKDIR /go/src/headscale WORKDIR /go/src/headscale

2
Dockerfile.alpine
View File

@ -1,5 +1,5 @@
# Builder image # Builder image
FROM docker.io/golang:1.18.0-alpine AS build FROM docker.io/golang:1.19.0-alpine AS build
ARG VERSION=dev ARG VERSION=dev
ENV GOPATH /go ENV GOPATH /go
WORKDIR /go/src/headscale WORKDIR /go/src/headscale

2
Dockerfile.debug
View File

@ -1,5 +1,5 @@
# Builder image # Builder image
FROM docker.io/golang:1.18.0-bullseye AS build FROM docker.io/golang:1.19.0-bullseye AS build
ARG VERSION=dev ARG VERSION=dev
ENV GOPATH /go ENV GOPATH /go
WORKDIR /go/src/headscale WORKDIR /go/src/headscale

4
docs/running-headscale-openbsd.md
View File

@ -17,7 +17,7 @@ describing how to make `headscale` run properly in a server environment.
```shell ```shell
# Install prerequistes # Install prerequistes
# 1. go v1.18+: headscale newer than 0.15 needs go 1.18+ to compile # 1. go v1.19+: headscale newer than 0.17 needs go 1.19+ to compile
# 2. gmake: Makefile in the headscale repo is written in GNU make syntax # 2. gmake: Makefile in the headscale repo is written in GNU make syntax
pkg_add -D snap go pkg_add -D snap go
pkg_add gmake pkg_add gmake
@ -46,7 +46,7 @@ cp headscale /usr/local/sbin
```shell ```shell
# Install prerequistes # Install prerequistes
# 1. go v1.18+: headscale newer than 0.15 needs go 1.18+ to compile # 1. go v1.19+: headscale newer than 0.17 needs go 1.19+ to compile
# 2. gmake: Makefile in the headscale repo is written in GNU make syntax # 2. gmake: Makefile in the headscale repo is written in GNU make syntax
git clone https://github.com/juanfont/headscale.git git clone https://github.com/juanfont/headscale.git

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/juanfont/headscale module github.com/juanfont/headscale
go 1.18 go 1.19
require ( require (
github.com/AlecAivazis/survey/v2 v2.3.5 github.com/AlecAivazis/survey/v2 v2.3.5