Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "update to go1.21.4" due to regressions / breaking changes. 

Unfortunately, the go1.21.4 security update exposed some regressions / breaking
changes in moby (docker engine) and containerd. These issues are looked into,
but in the meantime we should revert this patch.

This temporarily reintroduces CVE-2023-45284 and CVE-2023-45283.

This reverts commit 6472dabe4c.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-11-09 10:54:54 +01:00
parent ed1c8c1107
commit 4cf1c50ad1
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -63,7 +63,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: 1.21.4 go-version: 1.21.3
- -
name: Test name: Test
run: | run: |

2
Dockerfile
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_VARIANT=alpine ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.21.4 ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.2.1 ARG XX_VERSION=1.2.1
ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOVERSIONINFO_VERSION=v1.3.0

2
docker-bake.hcl
View File

@ -1,5 +1,5 @@
variable "GO_VERSION" { variable "GO_VERSION" {
default = "1.21.4" default = "1.21.3"
} }
variable "VERSION" { variable "VERSION" {
default = "" default = ""

2
dockerfiles/Dockerfile.dev
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.21.4 ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG BUILDX_VERSION=0.11.2 ARG BUILDX_VERSION=0.11.2

2
dockerfiles/Dockerfile.lint
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.21.4 ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.55.0 ARG GOLANGCI_LINT_VERSION=v1.55.0

2
dockerfiles/Dockerfile.vendor
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.21.4 ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG MODOUTDATED_VERSION=v0.8.0 ARG MODOUTDATED_VERSION=v0.8.0

2
e2e/testdata/Dockerfile.gencerts vendored
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.21.4 ARG GO_VERSION=1.21.3
FROM golang:${GO_VERSION}-alpine AS generated FROM golang:${GO_VERSION}-alpine AS generated
ENV GOTOOLCHAIN=local ENV GOTOOLCHAIN=local