Skip to content

Commit 3415f39

Browse files
Bump golang to v1.23.10 to fix CVEs for 1.16.2 release (#9058)
* Bump golang to v1.23.10 to fix CVEs Signed-off-by: Adarsh Saxena <adarsh.saxena@acquia.com> * Dockerfile restic miss 1.23.10 Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> * restic cve go1.23.10 Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Adarsh Saxena <adarsh.saxena@acquia.com> Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Co-authored-by: Tiger Kaovilai <tkaovila@redhat.com>
1 parent 8aeb8a2 commit 3415f39

6 files changed

Lines changed: 8 additions & 9 deletions

File tree

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Velero binary build section
16-
FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS velero-builder
16+
FROM --platform=$BUILDPLATFORM golang:1.23.10-bookworm AS velero-builder
1717

1818
ARG GOPROXY
1919
ARG BIN
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \
4949
go clean -modcache -cache
5050

5151
# Restic binary build section
52-
FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS restic-builder
52+
FROM --platform=$BUILDPLATFORM golang:1.23.10-bookworm AS restic-builder
5353

5454
ARG GOPROXY
5555
ARG BIN
@@ -82,4 +82,3 @@ COPY --from=velero-builder /output /
8282
COPY --from=restic-builder /output /
8383

8484
USER cnb:cnb
85-

Dockerfile-Windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ARG OS_VERSION=1809
1616

1717
# Velero binary build section
18-
FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS velero-builder
18+
FROM --platform=$BUILDPLATFORM golang:1.23.10-bookworm AS velero-builder
1919

2020
ARG GOPROXY
2121
ARG BIN

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
5252

5353
tilt_helper_dockerfile_header = """
5454
# Tilt image
55-
FROM golang:1.23.8 as tilt-helper
55+
FROM golang:1.23.10 as tilt-helper
5656
5757
# Support live reloading with Tilt
5858
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero
22

33
go 1.23.0
44

5-
toolchain go1.23.8
5+
toolchain go1.23.10
66

77
require (
88
cloud.google.com/go/storage v1.50.0

hack/build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$TARGETPLATFORM golang:1.23.8-bookworm
15+
FROM --platform=$TARGETPLATFORM golang:1.23.10-bookworm
1616

1717
ARG GOPROXY
1818

hack/fix_restic_cve.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/go.mod b/go.mod
2-
index 5f939c481..5c5db077f 100644
2+
index 5f939c481..97ef53433 100644
33
--- a/go.mod
44
+++ b/go.mod
55
@@ -24,32 +24,32 @@ require (
@@ -66,7 +66,7 @@ index 5f939c481..5c5db077f 100644
6666
-go 1.18
6767
+go 1.23.0
6868
+
69-
+toolchain go1.23.7
69+
+toolchain go1.23.10
7070
diff --git a/go.sum b/go.sum
7171
index 026e1d2fa..836a9b274 100644
7272
--- a/go.sum

0 commit comments

Comments
 (0)