Skip to content

Commit

Permalink
Merge pull request #5118 from thaJeztah/26.1_backport_bump_go1.21.11
Browse files Browse the repository at this point in the history
[26.1 backport] update to go1.21.11, Alpine 3.20
  • Loading branch information
thaJeztah committed Jun 4, 2024
2 parents 5dab297 + 0576b3d commit a61a0c3
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.10
go-version: 1.21.11
-
name: Test
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# syntax=docker/dockerfile:1

ARG BASE_VARIANT=alpine
ARG ALPINE_VERSION=3.18
ARG ALPINE_VERSION=3.20
ARG BASE_DEBIAN_DISTRO=bookworm

ARG GO_VERSION=1.21.10
ARG GO_VERSION=1.21.11
ARG XX_VERSION=1.4.0
ARG GOVERSIONINFO_VERSION=v1.3.0
ARG GOTESTSUM_VERSION=v1.10.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.10"
default = "1.21.11"
}
variable "VERSION" {
default = ""
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.authors
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG ALPINE_VERSION=3.18
ARG ALPINE_VERSION=3.20

FROM alpine:${ALPINE_VERSION} AS gen
RUN apk add --no-cache bash git
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG GO_VERSION=1.21.11
ARG ALPINE_VERSION=3.20

ARG BUILDX_VERSION=0.12.1
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG GO_VERSION=1.21.11
ARG ALPINE_VERSION=3.20
ARG GOLANGCI_LINT_VERSION=v1.55.2

FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.vendor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG GO_VERSION=1.21.11
ARG ALPINE_VERSION=3.20
ARG MODOUTDATED_VERSION=v0.8.0

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
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.10
ARG GO_VERSION=1.21.11

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

0 comments on commit a61a0c3

Please sign in to comment.