From 9926defe2c09fc0e6f79a0c1e361bf51727aafd5 Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 12:34:27 +0700 Subject: [PATCH 1/2] 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 9e51ab5..6692a46 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 19805f243553ebe92ff4315b4b45f780cf3b3716 Mon Sep 17 00:00:00 2001 From: NikitaSkrynnik Date: Fri, 17 Nov 2023 18:29:10 +0700 Subject: [PATCH 2/2] fix tests Signed-off-by: NikitaSkrynnik --- main_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main_test.go b/main_test.go index 63501c7..48c0be5 100644 --- a/main_test.go +++ b/main_test.go @@ -1,5 +1,7 @@ // Copyright (c) 2020-2022 Doc.ai and/or its affiliates. // +// Copyright (c) 2023 Cisco and/or its affiliates. +// // SPDX-License-Identifier: Apache-2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -68,7 +70,7 @@ func (t *RegistryTestSuite) SetupSuite() { require.NoError(t.T(), err) t.spireErrCh = spire.Start( spire.WithContext(t.ctx), - spire.WithEntry("spiffe://example.org/registry-proxy-dns", "unix:path:/bin/registry-proxy-dns"), + spire.WithEntry("spiffe://example.org/registry-proxy-dns", "unix:path:/usr/bin/registry-proxy-dns"), spire.WithEntry(fmt.Sprintf("spiffe://example.org/%s", filepath.Base(executable)), fmt.Sprintf("unix:path:%s", executable), ),