From 6194f049f15418b5d97740efb0330dd9a5063c84 Mon Sep 17 00:00:00 2001
From: Sharpened Blade <sharpenedblade@proton.me>
Date: Mon, 24 Jul 2023 16:17:49 +0530
Subject: [PATCH] feat: Use custom container for package builds

This will use a contianer with dependencies already installed. It is
published to ghcr.io/t2linux/fedora-kernel-build.

Merges https://github.com/t2linux/t2linux-fedora-kernel/pull/9
---
 .github/workflows/build.yml |  6 ++++--
 build-packages.sh           | 11 -----------
 sign-packages.sh            |  1 -
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7b170a..020b201 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,8 @@ jobs:
           docker run -t --privileged \
           -v "$PWD":/repo \
           -e PACKAGE \
-          fedora:38 /bin/bash -c "/repo/build-packages.sh"
+          ghcr.io/t2linux/fedora-kernel-build:latest \
+          /repo/build-packages.sh
         env:
           PACKAGE: ${{ matrix.package }}
 
@@ -70,7 +71,8 @@ jobs:
           docker run -t \
             -v $PWD:/repo \
             -e RPM_SIGNING_PRIVATE_KEY_B64 \
-            fedora:38 /bin/bash -c "/repo/sign-packages.sh"
+            ghcr.io/t2linux/fedora-kernel-build:latest \
+            /repo/sign-packages.sh
         env:
           RPM_SIGNING_PRIVATE_KEY_B64: ${{ secrets.RPM_SIGNING_PRIVATE_KEY_B64 }}
 
diff --git a/build-packages.sh b/build-packages.sh
index c82d461..f6a964f 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -1,17 +1,6 @@
 #!/usr/bin/bash
 source /repo/util.sh
 
-# Install dependencies
-dnf install -y --quiet koji git curl pesign rpmdevtools rpm-sign rpm-build mock zstd
-
-# Optimize mock
-echo 'config_opts["plugin_conf"]["package_state_enable"] = False
-config_opts["macros"]["%_smp_mflags"] = "-j8"
-config_opts["plugin_conf"]["ccache_opts"]["compress"] = True
-config_opts["plugin_conf"]["root_cache_opts"]["compress_program"] = "zstd"
-config_opts["plugin_conf"]["root_cache_opts"]["extension"] = ".zst"
-config_opts["plugin_conf"]["hw_info_enable"] = False' > /etc/mock/site-defaults.cfg
-
 cd /repo
 
 if [ "$PACKAGE" == "kernel" ]; then
diff --git a/sign-packages.sh b/sign-packages.sh
index 485718a..7f3eb83 100755
--- a/sign-packages.sh
+++ b/sign-packages.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/bash
 source /repo/util.sh
-dnf install --quiet -y rpm-sign rpmdevtools
 
 cd /repo/_output
 sign_packages $RPM_SIGNING_PRIVATE_KEY_B64 "T2Linux Fedora"