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

Merge pull request #4351 from thaJeztah/24.0_backport_update_go_1.20.5 

[24.0 backport] update go to go1.20.5, alpine 3.17
This commit is contained in:
Sebastiaan van Stijn 2023-06-21 10:55:21 +02:00 committed by GitHub
parent 0823df7daa f11f309090
commit 751bb353fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 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.20.4 go-version: 1.20.5
- -
name: Test name: Test
run: | run: |

4
Dockerfile
View File

@ -1,8 +1,8 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_VARIANT=alpine ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.20.4 ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.1.1 ARG XX_VERSION=1.1.1
ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOVERSIONINFO_VERSION=v1.3.0
ARG GOTESTSUM_VERSION=v1.8.2 ARG GOTESTSUM_VERSION=v1.8.2

2
docker-bake.hcl
View File

@ -1,5 +1,5 @@
variable "GO_VERSION" { variable "GO_VERSION" {
default = "1.20.4" default = "1.20.5"
} }
variable "VERSION" { variable "VERSION" {
default = "" default = ""

2
dockerfiles/Dockerfile.authors
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.17
FROM alpine:${ALPINE_VERSION} AS gen FROM alpine:${ALPINE_VERSION} AS gen
RUN apk add --no-cache bash git RUN apk add --no-cache bash git

4
dockerfiles/Dockerfile.dev
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.20.4 ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.17
ARG BUILDX_VERSION=0.10.4 ARG BUILDX_VERSION=0.10.4
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx

4
dockerfiles/Dockerfile.lint
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.20.4 ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.52.2 ARG GOLANGCI_LINT_VERSION=v1.52.2
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint

4
dockerfiles/Dockerfile.vendor
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.20.4 ARG GO_VERSION=1.20.5
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.17
ARG MODOUTDATED_VERSION=v0.8.0 ARG MODOUTDATED_VERSION=v0.8.0
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base

2
e2e/testdata/Dockerfile.gencerts vendored
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.20.4 ARG GO_VERSION=1.20.5
FROM golang:${GO_VERSION}-alpine AS generated FROM golang:${GO_VERSION}-alpine AS generated
RUN go install github.com/dmcgowan/quicktls@master RUN go install github.com/dmcgowan/quicktls@master