8000 Merge pull request #48123 from vvoland/v26.1-48120 · moby/moby@6bc4906 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6bc4906

Browse files
vvolandvvoland
authored
Merge pull request #48123 from vvoland/v26.1-48120
[26.1 backport] update to go1.21.12
2 parents f533464 + 6fbdce4 commit 6bc4906

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

‎.github/workflows/.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
default: "graphdriver"
1313

1414
env:
15-
GO_VERSION: "1.21.9"
15+
GO_VERSION: "1.21.12"
1616
GOTESTLIST_VERSION: v0.3.1
1717
TESTSTAT_VERSION: v0.1.25
1818
ITG_CLI_MATRIX_SIZE: 6

‎.github/workflows/.windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
default: false
2020

2121
env:
22-
GO_VERSION: "1.21.11"
22+
GO_VERSION: "1.21.12"
2323
GOTESTLIST_VERSION: v0.3.1
2424
TESTSTAT_VERSION: v0.1.25
2525
WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore

‎.github/workflows/buildkit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
pull_request:
1414

1515
env:
16-
GO_VERSION: "1.21.11"
16+
GO_VERSION: "1.21.12"
1717
DESTDIR: ./build
1818

1919
jobs:

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
pull_request:
1414

1515
env:
16-
GO_VERSION: "1.21.11"
16+
GO_VERSION: "1.21.12"
1717
GIT_PAGER: "cat"
1818
PAGER: "cat"
1919

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.7
22

3-
ARG GO_VERSION=1.21.11
3+
ARG GO_VERSION=1.21.12
44
ARG BASE_DEBIAN_DISTRO="bookworm"
55
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
66
ARG XX_VERSION=1.4.0

‎Dockerfile.simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
F1D0 @@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
ARG GO_VERSION=1.21.11
8+
ARG GO_VERSION=1.21.12
99

1010
ARG BASE_DEBIAN_DISTRO="bookworm"
1111
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

‎Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ FROM ${WINDOWS_BASE_IMAGE}:${WINDOWS_BASE_IMAGE_TAG}
161161
# Use PowerShell as the default shell
162162
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
163163

164-
ARG GO_VERSION=1.21.11
164+
ARG GO_VERSION=1.21.12
165165
ARG GOTESTSUM_VERSION=v1.8.2
166166
ARG GOWINRES_VERSION=v0.3.1
167167
ARG CONTAINERD_VERSION=v1.7.18

‎hack/dockerfiles/generate-files.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21.11
3+
ARG GO_VERSION=1.21.12
44
ARG BASE_DEBIAN_DISTRO="bookworm"
55
ARG PROTOC_VERSION=3.11.4
66

0 commit comments

Comments
 (0)
0