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

update go to 1.17.8 

Removes the platform based switch between different versions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Tonis Tiigi 2021-08-16 20:07:43 -07:00 committed by Sebastiaan van Stijn
parent 0b266ba0d8
commit 6119e4ba90
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
6 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -59,7 +59,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.16.11 go-version: 1.17.8
- -
name: Test name: Test
run: | run: |

17
Dockerfile
View File

@ -1,26 +1,15 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_VARIANT=alpine ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.16.11 ARG GO_VERSION=1.17.8
ARG XX_VERSION=1.1.0 ARG XX_VERSION=1.1.0
ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOVERSIONINFO_VERSION=v1.3.0
ARG GOTESTSUM_VERSION=v1.7.0 ARG GOTESTSUM_VERSION=v1.7.0
ARG BUILDX_VERSION=0.7.1 ARG BUILDX_VERSION=0.7.1
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable
FROM --platform=$BUILDPLATFORM golang:1.17rc1-${BASE_VARIANT} AS golatest
FROM gostable AS go-linux
FROM gostable AS go-darwin
FROM gostable AS go-windows-amd64
FROM gostable AS go-windows-386
FROM gostable AS go-windows-arm
FROM golatest AS go-windows-arm64
FROM go-windows-${TARGETARCH} AS go-windows
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
FROM go-${TARGETOS} AS build-base-alpine FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS build-base-alpine
COPY --from=xx / / COPY --from=xx / /
RUN apk add --no-cache bash clang lld llvm file git RUN apk add --no-cache bash clang lld llvm file git
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli
@ -30,7 +19,7 @@ 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 go-${TARGETOS} AS build-base-buster FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster
COPY --from=xx / / COPY --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld file RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld file
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli

2
docker-bake.hcl
View File

@ -1,5 +1,5 @@
variable "GO_VERSION" { variable "GO_VERSION" {
default = "1.16.11" default = "1.17.8"
} }
variable "VERSION" { variable "VERSION" {
default = "" default = ""

2
dockerfiles/Dockerfile.dev
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.16.11 ARG GO_VERSION=1.17.8
ARG BUILDX_VERSION=0.7.1 ARG BUILDX_VERSION=0.7.1
FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx

2
dockerfiles/Dockerfile.lint
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.16.11 ARG GO_VERSION=1.17.8
ARG GOLANGCI_LINT_VERSION=v1.23.8 ARG GOLANGCI_LINT_VERSION=v1.23.8
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint

2
dockerfiles/Dockerfile.vendor
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.16.11 ARG GO_VERSION=1.17.8
ARG MODOUTDATED_VERSION=v0.8.0 ARG MODOUTDATED_VERSION=v0.8.0
FROM golang:${GO_VERSION}-alpine AS base FROM golang:${GO_VERSION}-alpine AS base