From 69076b4a2cb2dbc0231fee68c2f6af5e91c4d2b8 Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 12:37:26 +0700 Subject: [PATCH 1/3] Update images in Dockerfile to fix CVEs Signed-off-by: NikitaSkrynnik --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 46e0c54..9434369 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -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 From 86b155eac4803a253434c5530e58ea24233f7c3f Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 18:24:51 +0700 Subject: [PATCH 2/3] fix tests Signed-off-by: NikitaSkrynnik --- suite_setup_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suite_setup_test.go b/suite_setup_test.go index f8c9b08..3dc73fa 100644 --- a/suite_setup_test.go +++ b/suite_setup_test.go @@ -67,7 +67,7 @@ func (f *TestSuite) SetupSuite() { f.Require().NoError(err) f.spireErrCh = spire.Start( spire.WithContext(f.ctx), - spire.WithEntry("spiffe://example.org/app", "unix:path:/bin/app"), + spire.WithEntry("spiffe://example.org/app", "unix:path:/usr/bin/app"), spire.WithEntry(fmt.Sprintf("spiffe://example.org/%s", filepath.Base(executable)), fmt.Sprintf("unix:path:%s", executable), ), From 190761ce203def0f5b01a7bf4178a4aacbc85dfd Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 18:28:02 +0700 Subject: [PATCH 3/3] fix linter Signed-off-by: NikitaSkrynnik --- suite_setup_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suite_setup_test.go b/suite_setup_test.go index 3dc73fa..051bb92 100644 --- a/suite_setup_test.go +++ b/suite_setup_test.go @@ -1,6 +1,6 @@ // Copyright (c) 2020-2022 Doc.ai and/or its affiliates. // -// Copyright (c) 2020-2022 Cisco and/or its affiliates. +// Copyright (c) 2020-2023 Cisco and/or its affiliates. // // SPDX-License-Identifier: Apache-2.0 //