Skip to content

Commit ed35193

Browse files
authored
Merge pull request #1892 from vmware-tanzu/pinny/bump-deps
Bump dependencies
2 parents 159b2d5 + 718cf23 commit ed35193

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
ARG BUILD_IMAGE=golang:1.22.1@sha256:34ce21a9696a017249614876638ea37ceca13cdd88f582caad06f87a8aa45bf3
7-
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:efea8b525e9deefb309c6ed41b8e69c85d901e0da30658e476e9f176f88c1b36
6+
ARG BUILD_IMAGE=golang:1.22.1@sha256:82e07063a1ac3ee59e6f38b1222e32ce88469e4431ff6496cc40fb9a0fc18229
7+
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:55c636171053dbc8ae07a280023bd787d2921f10e569f3e319f1539076dbba11
88

99
# Prepare to cross-compile by always running the build stage in the build platform, not the target platform.
1010
FROM --platform=$BUILDPLATFORM $BUILD_IMAGE as build-env

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/spf13/cobra v1.8.0
6060
github.com/spf13/pflag v1.0.5
6161
github.com/stretchr/testify v1.9.0
62-
github.com/tdewolff/minify/v2 v2.20.18
62+
github.com/tdewolff/minify/v2 v2.20.19
6363
go.uber.org/mock v0.4.0
6464
go.uber.org/zap v1.27.0
6565
golang.org/x/crypto v0.21.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
550550
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
551551
github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
552552
github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
553-
github.com/tdewolff/minify/v2 v2.20.18 h1:y+s6OzlZwFqApgNXWNtaMuEMEPbHT72zrCyb9Az35Xo=
554-
github.com/tdewolff/minify/v2 v2.20.18/go.mod h1:ulkFoeAVWMLEyjuDz1ZIWOA31g5aWOawCFRp9R/MudM=
553+
github.com/tdewolff/minify/v2 v2.20.19 h1:tX0SR0LUrIqGoLjXnkIzRSIbKJ7PaNnSENLD4CyH6Xo=
554+
github.com/tdewolff/minify/v2 v2.20.19/go.mod h1:ulkFoeAVWMLEyjuDz1ZIWOA31g5aWOawCFRp9R/MudM=
555555
github.com/tdewolff/parse/v2 v2.7.12 h1:tgavkHc2ZDEQVKy1oWxwIyh5bP4F5fEh/JmBwPP/3LQ=
556556
github.com/tdewolff/parse/v2 v2.7.12/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
557557
github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=

hack/Dockerfile_fips

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
# See https://go.googlesource.com/go/+/dev.boringcrypto/README.boringcrypto.md
1717
# and https://kupczynski.info/posts/fips-golang/ for details.
1818

19-
ARG BUILD_IMAGE=golang:1.22.1@sha256:34ce21a9696a017249614876638ea37ceca13cdd88f582caad06f87a8aa45bf3
20-
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:efea8b525e9deefb309c6ed41b8e69c85d901e0da30658e476e9f176f88c1b36
19+
ARG BUILD_IMAGE=golang:1.22.1@sha256:82e07063a1ac3ee59e6f38b1222e32ce88469e4431ff6496cc40fb9a0fc18229
20+
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:55c636171053dbc8ae07a280023bd787d2921f10e569f3e319f1539076dbba11
2121

2222
# This is not currently using --platform to prepare to cross-compile because we use gcc below to build
2323
# platform-specific GCO code. This makes multi-arch builds slow due to target platform emulation.

0 commit comments

Comments
 (0)