pomerium: 0.29.4 -> 0.30.3

This commit is contained in:
Morgan Helton
2025-07-16 21:21:45 -05:00
parent 51d8599151
commit 4d0a905c20
3 changed files with 12 additions and 12 deletions
@@ -1,4 +1,4 @@
From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001
From 640d11fae5bcf1fa8c1a54facbe168a256cacc1b Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 26 May 2024 12:17:01 -0500
Subject: [PATCH] envoy: allow specification of external binary
@@ -8,7 +8,7 @@ Subject: [PATCH] envoy: allow specification of external binary
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
index 8224f364..bb8b6506 100644
index 85c725629..4a726a44b 100644
--- a/pkg/envoy/envoy.go
+++ b/pkg/envoy/envoy.go
@@ -8,9 +8,9 @@ import (
@@ -21,8 +21,8 @@ index 8224f364..bb8b6506 100644
- "path"
"path/filepath"
"regexp"
"strconv"
@@ -35,8 +35,17 @@ import (
"runtime"
@@ -36,8 +36,17 @@ import (
const (
configFileName = "envoy-config.yaml"
@@ -40,7 +40,7 @@ index 8224f364..bb8b6506 100644
// A Server is a pomerium proxy implemented via envoy.
type Server struct {
ServerOptions
@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
@@ -95,14 +104,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
}
@@ -62,5 +62,5 @@ index 8224f364..bb8b6506 100644
grpcPort: src.GetConfig().GRPCPort,
httpPort: src.GetConfig().HTTPPort,
--
2.48.1
2.49.0
+5 -5
View File
@@ -1,5 +1,5 @@
{
buildGo123Module,
buildGoModule,
fetchFromGitHub,
lib,
envoy,
@@ -17,17 +17,17 @@ let
mapAttrsToList
;
in
buildGo123Module rec {
buildGoModule rec {
pname = "pomerium";
version = "0.29.4";
version = "0.30.3";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
hash = "sha256-Oj/wC3rr7CAw2iB0H8yUvzv5VCEIo8kc5sZrxFX6NrI=";
hash = "sha256-Rjv4GjyUs9sH+P5kYimxFnE2SBosEWbc7PbKIaVFxsI=";
};
vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";
vendorHash = "sha256-+SvKF54rkBY2wBZOYKuIV30BVqRqICuiPya+HApne1s=";
ui = mkYarnPackage {
inherit version;
+1 -1
View File
@@ -1 +1 @@
1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0
07zzvqfinl7qqmwh00izvfc0xch2rjr4s8b1ca9ay26krd4d4sap