From d150bba25b0a455e2d64f7dc07467fd61c48955b Mon Sep 17 00:00:00 2001
From: Cody Lee <cody.lee@datadoghq.com>
Date: Thu, 5 Jan 2023 20:08:18 -0600
Subject: [PATCH] use the gpg signing token to sign packages, switch back to
 rhel6 per discord

---
 .goreleaser.yaml             | 11 +++++++++--
 Makefile                     |  7 +++++++
 scripts/packagecloud_push.sh |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 00c6feda..cb704ec8 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -450,9 +450,16 @@ nfpms:
           mode: 0644
           owner: unpoller
           group: unpoller
-      
-      
+
     # signing
+    rpm:
+      signature:
+        key_file: "{{ .Env.PACKAGECLOUD_SIGNING_GPG }}"
+    deb:
+      signature:
+        key_file: "{{ .Env.PACKAGECLOUD_SIGNING_GPG }}"
+        type: origin
+
     scripts:
       preinstall: "scripts/pre-install.sh"
       postinstall: "scripts/post-install.sh"
diff --git a/Makefile b/Makefile
index cad248dd..8e8bb971 100644
--- a/Makefile
+++ b/Makefile
@@ -57,10 +57,17 @@ rsrc.syso: init/windows/application.ico init/windows/manifest.xml $(shell go env
 $(shell go env GOPATH)/bin/rsrc:
 	cd /tmp ; go get $(RSRC_BIN) ; go install $(RSRC_BIN)@latest
 
+build-and-release: export DOCKER_REGISTRY = ghcr.io
+build-and-release: export DOCKER_IMAGE_NAME = unpoller/unpoller
+build-and-release: export PACKAGECLOUD_SIGNING_GPG = 
 
 bulid-and-release: clean
 	goreleaser release --rm-dist
 
+build: export DOCKER_REGISTRY = ghcr.io
+build: export DOCKER_IMAGE_NAME = unpoller/unpoller
+build: export PACKAGECLOUD_SIGNING_GPG = 
+
 build: clean
 	goreleaser release --rm-dist --skip-validate --skip-publish --skip-sign --debug
 
diff --git a/scripts/packagecloud_push.sh b/scripts/packagecloud_push.sh
index 628f2d24..40905658 100755
--- a/scripts/packagecloud_push.sh
+++ b/scripts/packagecloud_push.sh
@@ -46,7 +46,7 @@ if [[ ${PACKAGE_VERSION} =~ .+-rc ]]; then
 fi
 
 export SUPPORTED_UBUNTU_VERSIONS="focal"
-export SUPPORTED_REDHAT_VERSIONS="7"
+export SUPPORTED_REDHAT_VERSIONS="6"
 
 if [[ $ARTIFACT_PATH == *termux* ]]; then
   # skip termux builds