Merge pull request #4822 from cloudxxx8/bump-spire

build: Bump spire version of images
edgexfoundry · Jul 10, 2024 · 059044c · 059044c
2 parents 5e6f439 + f201974
commit 059044c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cmd/security-spire-agent/Dockerfile b/cmd/security-spire-agent/Dockerfile
@@ -19,8 +19,8 @@
 ARG BUILDER_BASE=golang:1.21-alpine3.18
 FROM ${BUILDER_BASE} AS builder
 
-FROM ghcr.io/spiffe/spire-server:1.6.3 as spire_server
-FROM ghcr.io/spiffe/spire-agent:1.6.3 as spire_agent
+FROM ghcr.io/spiffe/spire-server:1.9.6 as spire_server
+FROM ghcr.io/spiffe/spire-agent:1.9.6 as spire_agent
 
 # Deployment image
 FROM alpine:3.18

diff --git a/cmd/security-spire-config/Dockerfile b/cmd/security-spire-config/Dockerfile
@@ -19,7 +19,7 @@
 ARG BUILDER_BASE=golang:1.21-alpine3.18
 FROM ${BUILDER_BASE} AS builder
 
-FROM ghcr.io/spiffe/spire-server:1.6.3 as spire_server
+FROM ghcr.io/spiffe/spire-server:1.9.6 as spire_server
 
 # Deployment image
 FROM alpine:3.18

diff --git a/cmd/security-spire-server/Dockerfile b/cmd/security-spire-server/Dockerfile
@@ -19,7 +19,7 @@
 ARG BUILDER_BASE=golang:1.21-alpine3.18
 FROM ${BUILDER_BASE} AS builder
 
-FROM ghcr.io/spiffe/spire-server:1.6.3 as spire_server
+FROM ghcr.io/spiffe/spire-server:1.9.6 as spire_server
 
 # Deployment image
 FROM alpine:3.18

diff --git a/go.mod b/go.mod
@@ -135,7 +135,7 @@ require (
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
-	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/grpc v1.64.1 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	nhooyr.io/websocket v1.8.11 // indirect

diff --git a/go.sum b/go.sum
@@ -994,8 +994,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
-google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
+google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
+google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=