chore(deps): bump golang from a6b787c to 1415bb0 (#4883)

* chore(deps): bump golang from `a6b787c` to `1415bb0`

Bumps golang from `a6b787c` to `1415bb0`.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix flaky test

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Caleb Doxsey <cdoxsey@pomerium.com>
This commit is contained in:
dependabot[bot] 2024-01-02 11:05:37 -07:00 committed by GitHub
parent ed6f5e7214
commit ded6dcefbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View file

@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.21.5-bookworm@sha256:a6b787c7f9046e3fdaa97bca1f76fd23ff4108f612de885e1af87e0dccc02f99 as build FROM golang:1.21.5-bookworm@sha256:1415bb0b25d3bffc0a44dcf9851c20a9f8bbe558095221d931f2e4a4cc3596eb as build
WORKDIR /go/src/github.com/pomerium/pomerium WORKDIR /go/src/github.com/pomerium/pomerium
RUN apt-get update \ RUN apt-get update \

View file

@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.21.5-bookworm@sha256:a6b787c7f9046e3fdaa97bca1f76fd23ff4108f612de885e1af87e0dccc02f99 as build FROM golang:1.21.5-bookworm@sha256:1415bb0b25d3bffc0a44dcf9851c20a9f8bbe558095221d931f2e4a4cc3596eb as build
WORKDIR /go/src/github.com/pomerium/pomerium WORKDIR /go/src/github.com/pomerium/pomerium
RUN apt-get update \ RUN apt-get update \

View file

@ -2,6 +2,7 @@ package grpcutil
import ( import (
"context" "context"
"errors"
"net" "net"
"time" "time"
@ -34,5 +35,9 @@ func ServeWithGracefulStop(ctx context.Context, srv *grpc.Server, li net.Listene
srv.Stop() srv.Stop()
}() }()
return srv.Serve(li) err := srv.Serve(li)
if errors.Is(err, grpc.ErrServerStopped) {
err = nil
}
return err
} }