fix accidentaly committed to main

grafana · Oct 18, 2024 · 4bec204 · 4bec204
1 parent e695b69
commit 4bec204
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/gpg/sign.go b/gpg/sign.go
@@ -35,17 +35,7 @@ func Signer(d *dagger.Client, pubkey, privkey, passphrase string) *dagger.Contai
 		WithMountedSecret("/root/.rpmdb/privkeys/grafana.key", gpgPrivateKeySecret).
 		WithMountedSecret("/root/.rpmdb/pubkeys/grafana.key", gpgPublicKeySecret).
 		WithMountedSecret("/root/.rpmdb/passkeys/grafana.key", gpgPassphraseSecret).
-		WithExec([]string{"/bin/sh", "-c", `
-			if grep -q "PUBLIC KEY" "/root/.rpmdb/pubkeys/grafana.key"; then
-				cp "/root/.rpmdb/pubkeys/grafana.key" "/tmp/grafana.key";
-			else
-				gpg --enarmor "/root/.rpmdb/pubkeys/grafana.key" > "/tmp/grafana.key";
-			fi;
-			if [ "$(tail -n 1 "/tmp/grafana.key" | wc -l)" = 0 ]; then
-				echo >> "/tmp/grafana.key";
-			fi;
-		`}).
-		WithExec([]string{"rpm", "--import", "/tmp/grafana.key"}).
+		WithExec([]string{"rpm", "--import", "/root/.rpmdb/pubkeys/grafana.key"}).
 		WithNewFile("/root/.rpmmacros", RPMMacros, dagger.ContainerWithNewFileOpts{
 			Permissions: 0400,
 		}).