Skip to content

Commit

Permalink
Revert "update to go1.21.4" due to regressions / breaking changes.
Browse files Browse the repository at this point in the history
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 6472dab.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Nov 9, 2023
1 parent ed1c8c1 commit 4cf1c50
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.21.4
go-version: 1.21.3
-
name: Test
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.21.4
ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.2.1
ARG GOVERSIONINFO_VERSION=v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "GO_VERSION" {
default = "1.21.4"
default = "1.21.3"
}
variable "VERSION" {
default = ""
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.4
ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17

ARG BUILDX_VERSION=0.11.2
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.4
ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.55.0

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.vendor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.4
ARG GO_VERSION=1.21.3
ARG ALPINE_VERSION=3.17
ARG MODOUTDATED_VERSION=v0.8.0

Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/Dockerfile.gencerts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.4
ARG GO_VERSION=1.21.3

FROM golang:${GO_VERSION}-alpine AS generated
ENV GOTOOLCHAIN=local
Expand Down

0 comments on commit 4cf1c50

Please sign in to comment.