diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index 9ade388825..548d8b0f5a 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -15,7 +15,7 @@ on: default: false env: - GO_VERSION: "1.20.12" + GO_VERSION: "1.20.13" GOTESTLIST_VERSION: v0.3.1 TESTSTAT_VERSION: v0.1.3 WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 570a68c00f..902e659a82 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -13,6 +13,7 @@ on: pull_request: env: + ALPINE_VERSION: "3.18" GO_VERSION: "1.20.12" DESTDIR: ./build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e077617159..ffa34e4114 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ on: pull_request: env: - GO_VERSION: "1.20.12" + GO_VERSION: "1.20.13" GOTESTLIST_VERSION: v0.3.1 TESTSTAT_VERSION: v0.1.3 ITG_CLI_MATRIX_SIZE: 6 diff --git a/Dockerfile b/Dockerfile index b32995b485..bfb64d9bd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.12 +ARG GO_VERSION=1.20.13 ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" ARG XX_VERSION=1.2.1 diff --git a/Dockerfile.simple b/Dockerfile.simple index 94f5402372..3c5e3694f9 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -ARG GO_VERSION=1.20.12 +ARG GO_VERSION=1.20.13 ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" diff --git a/Dockerfile.windows b/Dockerfile.windows index 7d0f35254f..85067feb60 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -165,7 +165,7 @@ FROM microsoft/windowsservercore # Use PowerShell as the default shell SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ARG GO_VERSION=1.20.12 +ARG GO_VERSION=1.20.13 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 ARG CONTAINERD_VERSION=v1.7.12 diff --git a/builder/builder-next/worker/worker.go b/builder/builder-next/worker/worker.go index dad7331aeb..3773b95c94 100644 --- a/builder/builder-next/worker/worker.go +++ b/builder/builder-next/worker/worker.go @@ -50,7 +50,7 @@ import ( ) func init() { - version.Version = "v0.11.7+d3e6c1360f6e" + version.Version = "v0.11.7+435cb77e369c" } const labelCreatedAt = "buildkit/createdat" diff --git a/vendor.mod b/vendor.mod index 9c27a4f2d3..3a56fcf0eb 100644 --- a/vendor.mod +++ b/vendor.mod @@ -56,7 +56,7 @@ require ( github.com/klauspost/compress v1.17.2 github.com/miekg/dns v1.1.43 github.com/mistifyio/go-zfs/v3 v3.0.1 - github.com/moby/buildkit v0.11.7-0.20230908085316-d3e6c1360f6e // IMPORTANT: when updating, also update the version in builder/builder-next/worker/worker.go + github.com/moby/buildkit v0.11.7-0.20240124010513-435cb77e369c // IMPORTANT: when updating, also update the version in builder/builder-next/worker/worker.go github.com/moby/ipvs v1.1.0 github.com/moby/locker v1.0.1 github.com/moby/patternmatcher v0.6.0 diff --git a/vendor.sum b/vendor.sum index ccde31c975..979c0cc634 100644 --- a/vendor.sum +++ b/vendor.sum @@ -1043,8 +1043,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/moby/buildkit v0.8.1/go.mod h1:/kyU1hKy/aYCuP39GZA9MaKioovHku57N6cqlKZIaiQ= -github.com/moby/buildkit v0.11.7-0.20230908085316-d3e6c1360f6e h1:iDGoHMw0bMy+AVD59fVDM+jH6rivbFKCVF4iZ+Uw1Rc= -github.com/moby/buildkit v0.11.7-0.20230908085316-d3e6c1360f6e/go.mod h1:bMQDryngJKGvJ/ZuRFhrejurbvYSv3NkGCheQ59X4AM= +github.com/moby/buildkit v0.11.7-0.20240124010513-435cb77e369c h1:g/BEZuMQ7Jws8NGsrS2yvMgtShhVe5t/IhSy7yP9Z0c= +github.com/moby/buildkit v0.11.7-0.20240124010513-435cb77e369c/go.mod h1:bMQDryngJKGvJ/ZuRFhrejurbvYSv3NkGCheQ59X4AM= github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ= github.com/moby/ipvs v1.1.0/go.mod h1:4VJMWuf098bsUMmZEiD4Tjk/O7mOn3l1PTD3s4OoYAs= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= diff --git a/vendor/modules.txt b/vendor/modules.txt index aac91b5c42..035f0618c3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -577,7 +577,7 @@ github.com/mistifyio/go-zfs/v3 # github.com/mitchellh/hashstructure/v2 v2.0.2 ## explicit; go 1.14 github.com/mitchellh/hashstructure/v2 -# github.com/moby/buildkit v0.11.7-0.20230908085316-d3e6c1360f6e +# github.com/moby/buildkit v0.11.7-0.20240124010513-435cb77e369c ## explicit; go 1.18 github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/types