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

Merge pull request #4117 from crazy-max/align-go-ver 

Dockerfile: align go version
This commit is contained in:
Sebastiaan van Stijn 2023-03-26 16:56:33 +02:00 committed by GitHub
parent f5d698a331 b854eff300
commit 59ec357996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker-bake.hcl
View File

@ -1,14 +1,14 @@
variable "GO_VERSION" { variable "GO_VERSION" {
default = "1.19.7" default = null
} }
variable "VERSION" { variable "VERSION" {
default = "" default = null
} }
variable "USE_GLIBC" { variable "USE_GLIBC" {
default = "" default = null
} }
variable "STRIP_TARGET" { variable "STRIP_TARGET" {
default = "" default = null
} }
variable "IMAGE_NAME" { variable "IMAGE_NAME" {
default = "docker-cli" default = "docker-cli"
@ -52,7 +52,7 @@ target "binary" {
platforms = ["local"] platforms = ["local"]
output = ["build"] output = ["build"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine" BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
PACKAGER_NAME = PACKAGER_NAME PACKAGER_NAME = PACKAGER_NAME
GO_STRIP = STRIP_TARGET GO_STRIP = STRIP_TARGET
@ -72,7 +72,7 @@ target "plugins" {
platforms = ["local"] platforms = ["local"]
output = ["build"] output = ["build"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine" BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
GO_STRIP = STRIP_TARGET GO_STRIP = STRIP_TARGET
} }
@ -155,7 +155,7 @@ target "e2e-image" {
output = ["type=docker"] output = ["type=docker"]
tags = ["${IMAGE_NAME}"] tags = ["${IMAGE_NAME}"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine" BASE_VARIANT = USE_GLIBC == "1" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
} }
} }

2
dockerfiles/Dockerfile.vendor
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG GO_VERSION=1.19.4 ARG GO_VERSION=1.19.7
ARG ALPINE_VERSION=3.16 ARG ALPINE_VERSION=3.16
ARG MODOUTDATED_VERSION=v0.8.0 ARG MODOUTDATED_VERSION=v0.8.0