Skip to content

Commit

Permalink
Merge pull request #670 from NikitaSkrynnik/update-dockerfile
Browse files Browse the repository at this point in the history
Update images in Dockerfile to fix CVEs
  • Loading branch information
denis-tingaikin authored Nov 17, 2023
2 parents 45edc13 + c6705c8 commit 838e644
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions suite_setup_test.go
Original file line number Diff line number Diff line change
@@ -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");
Expand Down Expand Up @@ -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),
),
Expand Down

0 comments on commit 838e644

Please sign in to comment.