Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
# syntax=docker/dockerfile:1.3

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.16.15
ARG GO_VERSION=1.17.8
ARG XX_VERSION=1.1.0

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 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 All @@ -27,7 +16,7 @@ ARG TARGETPLATFORM
# gcc is installed for libgcc only
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 / /
RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
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.15
GOVERSION: 1.17.8
DEPVERSION: v0.4.1

install:
Expand Down
1 change: 1 addition & 0 deletions cli-plugins/manager/manager_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package manager
Expand Down
1 change: 1 addition & 0 deletions cli-plugins/manager/suffix_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package manager
Expand Down
1 change: 1 addition & 0 deletions cli/command/container/signals_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package container
Expand Down
1 change: 1 addition & 0 deletions cli/command/container/signals_unix_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package container
Expand Down
1 change: 1 addition & 0 deletions cli/command/image/build/context_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package build
Expand Down
2 changes: 0 additions & 2 deletions cli/command/image/build/context_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build windows

package build

import (
Expand Down
1 change: 1 addition & 0 deletions cli/config/configfile/file_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package configfile
Expand Down
1 change: 1 addition & 0 deletions cli/config/credentials/default_store_unsupported.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows && !darwin && !linux
// +build !windows,!darwin,!linux

package credentials
Expand Down
1 change: 1 addition & 0 deletions cli/connhelper/commandconn/commandconn_unix_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package commandconn
Expand Down
1 change: 1 addition & 0 deletions cli/connhelper/commandconn/pdeathsig_nolinux.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

package commandconn
Expand Down
1 change: 1 addition & 0 deletions cli/connhelper/commandconn/session_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package commandconn
Expand Down
3 changes: 3 additions & 0 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
variable "GO_VERSION" {
default = "1.17.8"
}
variable "VERSION" {
default = ""
}
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.15
ARG GO_VERSION=1.17.8

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.15
ARG GO_VERSION=1.17.8

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.15
ARG GO_VERSION=1.17.8

# 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.15
ARG GO_VERSION=1.17.8
ARG GOLANGCI_LINTER_SHA="v1.21.0"

FROM golang:${GO_VERSION}-alpine AS build
Expand Down
1 change: 1 addition & 0 deletions opts/hosts_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package opts
Expand Down
2 changes: 0 additions & 2 deletions opts/hosts_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build windows

package opts

// defaultHost constant defines the default host string used by docker on Windows
Expand Down