Skip to content

Commit

Permalink
Merge pull request #4351 from thaJeztah/24.0_backport_update_go_1.20.5
Browse files Browse the repository at this point in the history
[24.0 backport] update go to go1.20.5, alpine 3.17
  • Loading branch information
thaJeztah committed Jun 21, 2023
2 parents 0823df7 + f11f309 commit 751bb35
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 @@ -63,7 +63,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.4
go-version: 1.20.5
-
name: Test
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# syntax=docker/dockerfile:1

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.20.4
ARG ALPINE_VERSION=3.16
ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.1.1
ARG GOVERSIONINFO_VERSION=v1.3.0
ARG GOTESTSUM_VERSION=v1.8.2
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.20.4"
default = "1.20.5"
}
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.16
ARG ALPINE_VERSION=3.17

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.20.4
ARG ALPINE_VERSION=3.16
ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.17

ARG BUILDX_VERSION=0.10.4
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.20.4
ARG ALPINE_VERSION=3.16
ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.52.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.20.4
ARG ALPINE_VERSION=3.16
ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.17
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.20.4
ARG GO_VERSION=1.20.5

FROM golang:${GO_VERSION}-alpine AS generated
RUN go install github.com/dmcgowan/quicktls@master
Expand Down

0 comments on commit 751bb35

Please sign in to comment.