IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Add mode label when building docker images (#68865)

Browse Source 
Add mode label when building docker image
This commit is contained in:
Dimitris Sotirakis 2023-05-23 10:37:52 +02:00 committed by GitHub
parent a9a9c089c6
commit bad570ee86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/build/cmd/builddocker.go
View File

@ -41,7 +41,7 @@ func BuildDocker(c *cli.Context) error {
useUbuntu) useUbuntu)
for _, arch := range buildConfig.Docker.Architectures { for _, arch := range buildConfig.Docker.Architectures {
if _, err := docker.BuildImage(version, arch, ".", useUbuntu, shouldSave, edition); err != nil { if _, err := docker.BuildImage(version, arch, ".", useUbuntu, shouldSave, edition, metadata.ReleaseMode.Mode); err != nil {
return cli.Exit(err.Error(), 1) return cli.Exit(err.Error(), 1)
} }
} }

3
pkg/build/docker/build.go
View File

@ -56,7 +56,7 @@ func verifyArchive(archive string) error {
// BuildImage builds a Docker image. // BuildImage builds a Docker image.
// The image tag is returned. // The image tag is returned.
func BuildImage(version string, arch config.Architecture, grafanaDir string, useUbuntu, shouldSave bool, edition config.Edition) ([]string, error) { func BuildImage(version string, arch config.Architecture, grafanaDir string, useUbuntu, shouldSave bool, edition config.Edition, mode config.VersionMode) ([]string, error) {
var baseArch string var baseArch string
switch arch { switch arch {
@ -127,6 +127,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
"--no-cache", "--no-cache",
"--file", "../../Dockerfile", "--file", "../../Dockerfile",
".", ".",
"--label", fmt.Sprintf("mode=%s", string(mode)),
} }
//nolint:gosec //nolint:gosec