Skip to content

Commit

Permalink
Rename Wolfi images to satisfy the release naming convention (#40886) (
Browse files Browse the repository at this point in the history
…#40902)

For example, `filebeat-wolfi-oss` -> `filebeat-oss-wolfi`

(cherry picked from commit 029e056)

Co-authored-by: Denis <denis.rechkunov@elastic.co>
  • Loading branch information
mergify[bot] and rdner authored Sep 19, 2024
1 parent 5bd39bb commit 774806e
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 90 deletions.
4 changes: 2 additions & 2 deletions dev-tools/packaging/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Loading

0 comments on commit 774806e

Please sign in to comment.