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

Merge pull request #4440 from thaJeztah/20.10_update_go_1.19.11 

[20.10] update go to go1.19.11, debian buster
This commit is contained in:
Sebastiaan van Stijn 2023-07-20 20:13:31 +02:00 committed by GitHub
parent 4b0940b33f 9b21793890
commit 51c3245666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.19.10 ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG XX_VERSION=1.1.0 ARG XX_VERSION=1.1.0
@ -17,12 +17,12 @@ ARG TARGETPLATFORM
# gcc is installed for libgcc only # gcc is installed for libgcc only
RUN xx-apk add --no-cache musl-dev gcc RUN xx-apk add --no-cache musl-dev gcc
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
COPY --from=xx / / COPY --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y clang lld file RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli
FROM build-base-buster AS build-buster FROM build-base-bullseye AS build-bullseye
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev

2
appveyor.yml
View File

@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
environment: environment:
GOPATH: c:\gopath GOPATH: c:\gopath
GOVERSION: 1.19.10 GOVERSION: 1.19.11
DEPVERSION: v0.4.1 DEPVERSION: v0.4.1
install: install:

4
docker-bake.hcl
View File

@ -1,5 +1,5 @@
variable "GO_VERSION" { variable "GO_VERSION" {
default = "1.19.10" default = "1.19.11"
} }
variable "VERSION" { variable "VERSION" {
default = "" default = ""
@ -22,7 +22,7 @@ target "binary" {
platforms = ["local"] platforms = ["local"]
output = ["build"] output = ["build"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine" BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
GO_STRIP = STRIP_TARGET GO_STRIP = STRIP_TARGET
} }

2
dockerfiles/Dockerfile.binary-native
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.19.10 ARG GO_VERSION=1.19.11
FROM golang:${GO_VERSION}-alpine FROM golang:${GO_VERSION}-alpine

2
dockerfiles/Dockerfile.dev
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.19.10 ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang

4
dockerfiles/Dockerfile.e2e
View File

@ -1,7 +1,7 @@
ARG GO_VERSION=1.19.10 ARG GO_VERSION=1.19.11
# Use Debian based image as docker-compose requires glibc. # Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster FROM golang:${GO_VERSION}-bullseye
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \

2
dockerfiles/Dockerfile.lint
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.19.10 ARG GO_VERSION=1.19.11
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.49.0 ARG GOLANGCI_LINT_VERSION=v1.49.0