fix linux package dependencies (#620)

* fix linux package dependencies Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> * depend on bash for debian systems Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> * revert bash dependency Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com> --------- Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
open-telemetry · Aug 6, 2024 · 73a756f · 73a756f
1 parent 5342205
commit 73a756f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -140,6 +140,13 @@ func Package(dist string) config.NFPM {
 		License:     "Apache 2.0",
 		Description: fmt.Sprintf("OpenTelemetry Collector - %s", dist),
 		Maintainer:  "The OpenTelemetry Collector maintainers <cncf-opentelemetry-maintainers@lists.cncf.io>",
+		Overrides: map[string]config.NFPMOverridables{
+			"rpm": {
+				Dependencies: []string{
+					"/bin/sh",
+				},
+			},
+		},
 
 		NFPMOverridables: config.NFPMOverridables{
 			PackageName: dist,
@@ -164,7 +171,6 @@ func Package(dist string) config.NFPM {
 					Type:        "config|noreplace",
 				},
 			},
-			Dependencies: []string{"/bin/sh"},
 		},
 	}
 }

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -55,8 +55,6 @@ archives:
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
   - package_name: otelcol-contrib
-    dependencies:
-      - /bin/sh
     contents:
       - src: otelcol-contrib.service
         dst: /lib/systemd/system/otelcol-contrib.service
@@ -70,6 +68,10 @@ nfpms:
       preinstall: preinstall.sh
       postinstall: postinstall.sh
       preremove: preremove.sh
+    overrides:
+      rpm:
+        dependencies:
+          - /bin/sh
     id: otelcol-contrib
     builds:
       - otelcol-contrib

diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml
@@ -55,8 +55,6 @@ archives:
     name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}'
 nfpms:
   - package_name: otelcol
-    dependencies:
-      - /bin/sh
     contents:
       - src: otelcol.service
         dst: /lib/systemd/system/otelcol.service
@@ -70,6 +68,10 @@ nfpms:
       preinstall: preinstall.sh
       postinstall: postinstall.sh
       preremove: preremove.sh
+    overrides:
+      rpm:
+        dependencies:
+          - /bin/sh
     id: otelcol
     builds:
       - otelcol