diff --git a/Dockerfile b/Dockerfile index 252aa55a..4e646b18 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 diff --git a/suite_setup_test.go b/suite_setup_test.go index 9b4b4c3f..eb550bf5 100644 --- a/suite_setup_test.go +++ b/suite_setup_test.go @@ -1,7 +1,7 @@ -// Copyright (c) 2020-2022 Cisco and/or its affiliates. -// // Copyright (c) 2020-2022 Doc.ai and/or its affiliates. // +// Copyright (c) 2020-2023 Cisco and/or its affiliates. +// // SPDX-License-Identifier: Apache-2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -92,7 +92,7 @@ func (f *ForwarderTestSuite) SetupSuite() { f.Require().NoError(err) f.spireErrCh = spire.Start( spire.WithContext(f.ctx), - spire.WithEntry("spiffe://example.org/forwarder", "unix:path:/bin/forwarder"), + spire.WithEntry("spiffe://example.org/forwarder", "unix:path:/usr/bin/forwarder"), spire.WithEntry(fmt.Sprintf("spiffe://example.org/%s", filepath.Base(executable)), fmt.Sprintf("unix:path:%s", executable), ),