From af44aff5cf9d2d8b9c2dc4c25762d6b3ebca399d Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 12:35:37 +0700 Subject: [PATCH 1/2] Update images in Dockerfile to fix CVEs Signed-off-by: NikitaSkrynnik --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa3c464..77fd4b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.20.5-buster as go +FROM golang:1.20.11 as go ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.1 +RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.22 ADD https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz . RUN tar xzvf spire-1.2.2-linux-x86_64-glibc.tar.gz -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent From 8136380c70fd5625f478d54b6acab3b2bb12ef32 Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 18:26:02 +0700 Subject: [PATCH 2/2] fix tests Signed-off-by: NikitaSkrynnik --- main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main_test.go b/main_test.go index c17a4b9..fc4afb3 100644 --- a/main_test.go +++ b/main_test.go @@ -79,7 +79,7 @@ func (t *RegistryTestSuite) SetupSuite() { require.NoError(t.T(), err) t.spireErrCh = spire.Start( spire.WithContext(t.ctx), - spire.WithEntry("spiffe://example.org/registry-memory", "unix:path:/bin/registry-memory"), + spire.WithEntry("spiffe://example.org/registry-memory", "unix:path:/usr/bin/registry-memory"), spire.WithEntry(fmt.Sprintf("spiffe://example.org/%s", filepath.Base(executable)), fmt.Sprintf("unix:path:%s", executable), ),