mirror of
https://github.com/pomerium/pomerium.git
synced 2025-06-13 16:24:16 +02:00
deployment: Envoy cross platform improvements (#701)
* Share processgroup on all platforms * Fix cross platform release handling
This commit is contained in:
parent
d58f68ab15
commit
65bb1501fd
4 changed files with 14 additions and 6 deletions
13
.github/goreleaser.yaml
vendored
13
.github/goreleaser.yaml
vendored
|
@ -6,6 +6,10 @@ release:
|
||||||
name: pomerium
|
name: pomerium
|
||||||
name_template: "v{{.Version}}"
|
name_template: "v{{.Version}}"
|
||||||
|
|
||||||
|
env:
|
||||||
|
- GO111MODULE=on
|
||||||
|
- CGO_ENABLED=0
|
||||||
|
|
||||||
before:
|
before:
|
||||||
hooks:
|
hooks:
|
||||||
- go mod download
|
- go mod download
|
||||||
|
@ -15,8 +19,6 @@ builds:
|
||||||
- id: pomerium
|
- id: pomerium
|
||||||
main: cmd/pomerium/main.go
|
main: cmd/pomerium/main.go
|
||||||
binary: pomerium
|
binary: pomerium
|
||||||
env:
|
|
||||||
- CGO_ENABLED=0
|
|
||||||
goarch:
|
goarch:
|
||||||
- amd64
|
- amd64
|
||||||
goos:
|
goos:
|
||||||
|
@ -32,13 +34,14 @@ builds:
|
||||||
- -X github.com/pomerium/pomerium/internal/version.ProjectURL=https://wwww.pomerium.io
|
- -X github.com/pomerium/pomerium/internal/version.ProjectURL=https://wwww.pomerium.io
|
||||||
|
|
||||||
hooks:
|
hooks:
|
||||||
post: ./scripts/embed-envoy.bash {{ .Path }}
|
post:
|
||||||
|
- cmd: ./scripts/embed-envoy.bash {{ .Path }}
|
||||||
|
env:
|
||||||
|
- GOOS={{ .Target }}
|
||||||
|
|
||||||
- id: pomerium-cli
|
- id: pomerium-cli
|
||||||
main: cmd/pomerium-cli/cli.go
|
main: cmd/pomerium-cli/cli.go
|
||||||
binary: pomerium-cli
|
binary: pomerium-cli
|
||||||
env:
|
|
||||||
- CGO_ENABLED=0
|
|
||||||
goarch:
|
goarch:
|
||||||
- amd64
|
- amd64
|
||||||
- arm
|
- arm
|
||||||
|
|
|
@ -5,5 +5,6 @@ package envoy
|
||||||
import "syscall"
|
import "syscall"
|
||||||
|
|
||||||
var sysProcAttr = &syscall.SysProcAttr{
|
var sysProcAttr = &syscall.SysProcAttr{
|
||||||
|
Setpgid: true,
|
||||||
Pdeathsig: syscall.SIGTERM,
|
Pdeathsig: syscall.SIGTERM,
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,4 +4,6 @@ package envoy
|
||||||
|
|
||||||
import "syscall"
|
import "syscall"
|
||||||
|
|
||||||
var sysProcAttr = &syscall.SysProcAttr{}
|
var sysProcAttr = &syscall.SysProcAttr{
|
||||||
|
Setpgid: true,
|
||||||
|
}
|
||||||
|
|
|
@ -5,6 +5,8 @@ BINARY=$1
|
||||||
|
|
||||||
ENVOY_VERSION=1.14.1
|
ENVOY_VERSION=1.14.1
|
||||||
DIR=$(dirname "${BINARY}")
|
DIR=$(dirname "${BINARY}")
|
||||||
|
GOOS=$(echo "${GOOS-}" | cut -d _ -f 1) # goreleaser is fine
|
||||||
|
|
||||||
GOOS=$(go env GOOS)
|
GOOS=$(go env GOOS)
|
||||||
|
|
||||||
if [ "${GOOS}" == "darwin" ]; then
|
if [ "${GOOS}" == "darwin" ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue