Skip to content

Commit

Permalink
update go to 1.17
Browse files Browse the repository at this point in the history
Removes the platform based switch between different versions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
  • Loading branch information
tonistiigi committed Aug 17, 2021
1 parent e3dfc24 commit 9de2e44
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 18 deletions.
15 changes: 2 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
# syntax=docker/dockerfile:1.3

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.16.7

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
ARG GO_VERSION=1.17.0

FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:620d36a9d7f1e3b102a5c7e8eff12081ac363828b3a44390f24fa8da2d49383d AS xx

FROM go-${TARGETOS} AS build-base-alpine
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS build-base-alpine
COPY --from=xx / /
RUN apk add --no-cache clang lld llvm file git
WORKDIR /go/src/github.com/docker/cli
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli

environment:
GOPATH: c:\gopath
GOVERSION: 1.16.7
GOVERSION: 1.17.0
DEPVERSION: v0.4.1

install:
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.binary-native
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.7
ARG GO_VERSION=1.17.0

FROM golang:${GO_VERSION}-alpine

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.3

ARG GO_VERSION=1.16.7
ARG GO_VERSION=1.17.0

FROM golang:${GO_VERSION}-alpine AS golang
ENV CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.7
ARG GO_VERSION=1.17.0

# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.3

ARG GO_VERSION=1.16.7
ARG GO_VERSION=1.17.0
ARG GOLANGCI_LINT_VERSION=v1.23.8

FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
Expand Down

0 comments on commit 9de2e44

Please sign in to comment.