Build: Streamline and sync dockerfiles (#58101)

* streamline and sync dockerfiles

* improve go dependency cacheability

* unify alpine and ubuntu Dockerfiles

* include glibc support in locally-built alpine images
This commit is contained in:
Dan Cech
2022-11-28 14:43:42 -05:00
committed by GitHub
parent 84ec35a4ad
commit 9fec54df2d
12 changed files with 270 additions and 346 deletions
+1 -3
View File
@@ -70,12 +70,10 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
}
libc := "-musl"
dockerfile := "Dockerfile"
baseImage := fmt.Sprintf("%salpine:3.15", baseArch)
tagSuffix := ""
if useUbuntu {
libc = ""
dockerfile = "ubuntu.Dockerfile"
baseImage = fmt.Sprintf("%subuntu:20.04", baseArch)
tagSuffix = "-ubuntu"
}
@@ -120,7 +118,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
args := []string{
"build", "--build-arg", fmt.Sprintf("BASE_IMAGE=%s", baseImage),
"--build-arg", fmt.Sprintf("GRAFANA_TGZ=%s", archive), "--tag", tag, "--no-cache",
"-f", dockerfile, ".",
".",
}
log.Printf("Running Docker: docker %s", strings.Join(args, " "))