Rename Wolfi images to satisfy the release naming convention (elastic…

…#40886) For example, `filebeat-wolfi-oss` -> `filebeat-oss-wolfi`
Linu-Elias · Sep 19, 2024 · 029e056 · 029e056
1 parent 53ed022
commit 029e056
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 90 deletions.
diff --git a/dev-tools/packaging/package_test.go b/dev-tools/packaging/package_test.go
@@ -466,9 +466,9 @@ func checkDockerEntryPoint(t *testing.T, p *packageFile, info *dockerInfo) {
 	})
 }
 
-// {BeatName}-{OptionalVariantSuffix}-oss-{version}-{os}-{arch}.docker.tar.gz
+// {BeatName}-oss-{OptionalVariantSuffix}-{version}-{os}-{arch}.docker.tar.gz
 // For example, `heartbeat-oss-8.16.0-linux-arm64.docker.tar.gz`
-var ossSuffixRegexp = regexp.MustCompile(`^(\w+)(-\w+)?-oss-.+$`)
+var ossSuffixRegexp = regexp.MustCompile(`^(\w+)-oss-.+$`)
 
 func checkDockerLabels(t *testing.T, p *packageFile, info *dockerInfo, file string) {
 	vendor := info.Config.Labels["org.label-schema.vendor"]