diff --git a/.github/workflows/docker-version-branches.yaml b/.github/workflows/docker-version-branches.yaml index b5629e0f5..444744719 100644 --- a/.github/workflows/docker-version-branches.yaml +++ b/.github/workflows/docker-version-branches.yaml @@ -5,6 +5,7 @@ on: push: branches: - 0-[0-9]+-* + - experimental/* jobs: publish: @@ -43,6 +44,6 @@ jobs: context: . file: ./Dockerfile push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/go.mod b/go.mod index 10649981c..a29171a17 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/pires/go-proxyproto v0.8.0 github.com/pomerium/csrf v1.7.0 github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 - github.com/pomerium/envoy-custom v1.33.0 + github.com/pomerium/envoy-custom v1.33.1-0.20250327222650-3da0fc300b58 github.com/pomerium/protoutil v0.0.0-20240813175624-47b7ac43ff46 github.com/pomerium/webauthn v0.0.0-20240603205124-0428df511172 github.com/prometheus/client_golang v1.21.0 @@ -262,5 +262,3 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) - -replace github.com/pomerium/envoy-custom => ../envoy-custom diff --git a/go.sum b/go.sum index 1c0d417eb..04d031c35 100644 --- a/go.sum +++ b/go.sum @@ -548,6 +548,8 @@ github.com/pomerium/csrf v1.7.0 h1:Qp4t6oyEod3svQtKfJZs589mdUTWKVf7q0PgCKYCshY= github.com/pomerium/csrf v1.7.0/go.mod h1:hAPZV47mEj2T9xFs+ysbum4l7SF1IdrryYaY6PdoIqw= github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 h1:3YQY1sb54tEEbr0L73rjHkpLB0IB6qh3zl1+XQbMLis= github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524/go.mod h1:7fGbUYJnU8RcxZJvUvhukOIBv1G7LWDAHMfDxAf5+Y0= +github.com/pomerium/envoy-custom v1.33.1-0.20250327222650-3da0fc300b58 h1:okkm5DxZ3t7gj2X86WSiUsbyXYChcaFV3K9/S60hWsg= +github.com/pomerium/envoy-custom v1.33.1-0.20250327222650-3da0fc300b58/go.mod h1:6nr0BrchI8Y+A01k+HoPVGBhwgcpFhkJzsNJKOr9bKs= github.com/pomerium/protoutil v0.0.0-20240813175624-47b7ac43ff46 h1:NRTg8JOXCxcIA1lAgD74iYud0rbshbWOB3Ou4+Huil8= github.com/pomerium/protoutil v0.0.0-20240813175624-47b7ac43ff46/go.mod h1:QqZmx6ZgPxz18va7kqoT4t/0yJtP7YFIDiT/W2n2fZ4= github.com/pomerium/webauthn v0.0.0-20240603205124-0428df511172 h1:TqoPqRgXSHpn+tEJq6H72iCS5pv66j3rPprThUEZg0E= diff --git a/pkg/envoy/files/files_darwin_arm64.go b/pkg/envoy/files/files_darwin_arm64.go index 00e7bf33a..9ae8eda00 100644 --- a/pkg/envoy/files/files_darwin_arm64.go +++ b/pkg/envoy/files/files_darwin_arm64.go @@ -5,11 +5,11 @@ package files import _ "embed" // embed -//go:embed envoy +//go:embed envoy-darwin-arm64 var rawBinary []byte -//go:embed envoy.sha256 +//go:embed envoy-darwin-arm64.sha256 var rawChecksum string -//go:embed envoy.version +//go:embed envoy-darwin-arm64.version var rawVersion string diff --git a/pkg/envoy/get-envoy/main.go b/pkg/envoy/get-envoy/main.go index 2df6299c3..14c7867c3 100644 --- a/pkg/envoy/get-envoy/main.go +++ b/pkg/envoy/get-envoy/main.go @@ -16,14 +16,14 @@ import ( ) var ( - envoyVersion = "1.32.3" + envoyVersion = "v1.33.1-demo" targets = []string{ - "darwin-amd64", - "darwin-arm64", + //"darwin-amd64", + //"darwin-arm64", "linux-amd64", - "linux-arm64", + //"linux-arm64", } - baseURL = "https://github.com/pomerium/envoy-custom/releases/download/v" + envoyVersion + baseURL = "https://github.com/kralicky/envoy-custom/releases/download/demo" ) func main() {