IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-24 09:50:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Grafana Enterprise Packaging: Set to conflict with grafana, not replace (#58189)

Browse Source 
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace
When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana
This is not what we want. Users should be able to install either OSS or Enterprise

* Set it only one way. It's how it's currently tested
This commit is contained in:
Julien Duchesne 2022-11-08 07:08:01 -05:00 committed by GitHub
parent 5fa0936b7e
commit 786c7faff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/build/packaging/grafana.go
View File

@ -384,7 +384,7 @@ func executeFPM(options linuxPackageOptions, packageRoot, srcDir string) error {
"-a", string(options.packageArch),
}
if options.edition == config.EditionEnterprise || options.edition == config.EditionEnterprise2 || options.goArch == config.ArchARMv6 {
args = append(args, "--replaces", "grafana")
args = append(args, "--conflicts", "grafana")
}
if options.edition == config.EditionOSS {
args = append(args, "--license", "\"AGPLv3\"")