Skip to content

bakefile: try to keep defaults in the Dockerfile #3898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thaJeztah wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −32
Draft

bakefile: try to keep defaults in the Dockerfile #3898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 31 additions & 32 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,40 @@
variable "GO_VERSION" {
default = "1.19.3"
variable "GO_VERSION" {}
variable "VERSION" {}
variable "USE_GLIBC" {}
variable "STRIP_TARGET" {}
variable "IMAGE_NAME" {
default = "docker-cli"
}
variable "VERSION" {
default = ""

# Sets the name of the company that produced the windows binary.
variable "PACKAGER_NAME" {}

variable "binary_args" {
default = {}
}
variable "USE_GLIBC" {
default = ""

variable "go_version" {
default = GO_VERSION != "" ? { GO_VERSION = GO_VERSION } : {}
}
variable "STRIP_TARGET" {
default = ""

variable "go_strip" {
default = STRIP_TARGET != "" ? { GO_STRIP = STRIP_TARGET } : {}
}
variable "IMAGE_NAME" {
default = "docker-cli"

variable "variant" {
default = USE_GLIBC != "" ? { BASE_VARIANT = "bullseye" } : {}
}

# Sets the name of the company that produced the windows binary.
variable "PACKAGER_NAME" {
default = ""
variable "version" {
default = VERSION != "" ? { VERSION = VERSION } : {}
}

variable "packager_name" {
default = PACKAGER_NAME != "" ? { PACKAGER_NAME = PACKAGER_NAME } : {}
}

target "_common" {
args = {
GO_VERSION = GO_VERSION
BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
}
args = merge(go_version, { BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1 })
}

target "_platforms" {
Expand Down Expand Up @@ -51,12 +62,7 @@ target "binary" {
target = "binary"
platforms = ["local"]
output = ["build"]
args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION
PACKAGER_NAME = PACKAGER_NAME
GO_STRIP = STRIP_TARGET
}
args = merge(go_strip, variant, version, packager_name)
}

target "dynbinary" {
Expand All @@ -71,11 +77,7 @@ target "plugins" {
target = "plugins"
platforms = ["local"]
output = ["build"]
args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION
GO_STRIP = STRIP_TARGET
}
args = merge(go_strip, variant, version)
}

target "cross" {
Expand Down Expand Up @@ -154,8 +156,5 @@ target "e2e-image" {
target = "e2e"
output = ["type=docker"]
tags = ["${IMAGE_NAME}"]
args = {
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION
}
args = merge(go_version, variant, version)
}