From e914001599f00557fb4502c96badb4d8e7912906 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 5 Nov 2020 16:08:29 +0000 Subject: [PATCH] [packaging] add SNAPSHOT in the metadata labels if required (#22432) --- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 4 ++-- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 7ab87f6f3ecc..7c00afaca816 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -43,7 +43,7 @@ LABEL \ org.label-schema.vendor="{{ .BeatVendor }}" \ org.label-schema.license="{{ .License }}" \ org.label-schema.name="{{ .BeatName }}" \ - org.label-schema.version="{{ beat_version }}" \ + org.label-schema.version="{{ beat_version }}{{if .Snapshot}}-SNAPSHOT{{end}}" \ org.label-schema.url="{{ .BeatURL }}" \ org.label-schema.vcs-url="{{ $repoInfo.RootImportPath }}" \ org.label-schema.vcs-ref="{{ commit }}" \ @@ -56,7 +56,7 @@ LABEL \ name="{{ .BeatName }}" \ maintainer="infra@elastic.co" \ vendor="{{ .BeatVendor }}" \ - version="{{ beat_version }}" \ + version="{{ beat_version }}{{if .Snapshot}}-SNAPSHOT{{end}}" \ release="1" \ url="{{ .BeatURL }}" \ summary="{{ .BeatName }}" \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 8b7eb80745c3..f5cbccdcb206 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -37,7 +37,7 @@ LABEL \ org.label-schema.vendor="{{ .BeatVendor }}" \ org.label-schema.license="{{ .License }}" \ org.label-schema.name="{{ .BeatName }}" \ - org.label-schema.version="{{ beat_version }}" \ + org.label-schema.version="{{ beat_version }}{{if .Snapshot}}-SNAPSHOT{{end}}" \ org.label-schema.url="{{ .BeatURL }}" \ org.label-schema.vcs-url="{{ $repoInfo.RootImportPath }}" \ org.label-schema.vcs-ref="{{ commit }}" \ @@ -50,7 +50,7 @@ LABEL \ name="{{ .BeatName }}" \ maintainer="infra@elastic.co" \ vendor="{{ .BeatVendor }}" \ - version="{{ beat_version }}" \ + version="{{ beat_version }}{{if .Snapshot}}-SNAPSHOT{{end}}" \ release="1" \ url="{{ .BeatURL }}" \ summary="{{ .BeatName }}" \