From dba7dcb99de220949e7a0fe45bd8113299e2ddb9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 23 May 2023 09:52:38 +0100 Subject: [PATCH] [v10.0.x] Docker: Add `mode` label when building docker images (#68871) Docker: Add `mode` label when building docker images (#68865) Add mode label when building docker image (cherry picked from commit bad570ee862c0dfb88de5f33bb7afc5459be6308) Co-authored-by: Dimitris Sotirakis --- pkg/build/cmd/builddocker.go | 2 +- pkg/build/docker/build.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/build/cmd/builddocker.go b/pkg/build/cmd/builddocker.go index 0dffd5dd2c8..f623057ee60 100644 --- a/pkg/build/cmd/builddocker.go +++ b/pkg/build/cmd/builddocker.go @@ -41,7 +41,7 @@ func BuildDocker(c *cli.Context) error { useUbuntu) 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) } } diff --git a/pkg/build/docker/build.go b/pkg/build/docker/build.go index 55e49703088..80c50697541 100644 --- a/pkg/build/docker/build.go +++ b/pkg/build/docker/build.go @@ -56,7 +56,7 @@ func verifyArchive(archive string) error { // BuildImage builds a Docker image. // 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 switch arch { @@ -127,6 +127,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use "--no-cache", "--file", "../../Dockerfile", ".", + "--label", fmt.Sprintf("mode=%s", string(mode)), } //nolint:gosec