From 5507bf9ff2db70d05781ef77cdd839b00bf70907 Mon Sep 17 00:00:00 2001
From: lleyton <lleyton@fyralabs.com>
Date: Sat, 14 Jan 2023 22:33:26 +0000
Subject: [PATCH] Use terrapkg/builder image (#124)

---
 .github/workflows/autobuild.yml    | 20 ++------------------
 .github/workflows/build.yml        | 11 +----------
 .github/workflows/lint.yml         |  4 +---
 .github/workflows/mass-rebuild.yml | 12 +-----------
 .github/workflows/update-comps.yml |  9 +--------
 .github/workflows/update.yml       |  8 +-------
 6 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index cc6228735a..2c388061a4 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -17,17 +17,10 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
       options: --cap-add=SYS_ADMIN --privileged
     # check out the repo
     steps:
-      - name: Set up dependencies
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
-          sudo dnf install -y anda mock rpm-build git-core
-          # add to safe directory
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -68,15 +61,9 @@ jobs:
     #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
-
       - uses: terrapkg/anda-build@main
         with:
           name: "${{ matrix.pkg.pkg }}"
@@ -84,9 +71,6 @@ jobs:
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
 
-      - name: Install Subatomic client
-        run: sudo dnf install -y subatomic-cli
-
       - name: Upload packages to subatomic
         run: |
           subatomic-cli upload --prune \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e56a2dfa27..b6eb3297e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,15 +25,9 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
-
       - uses: terrapkg/anda-build@main
         with:
           name: "${{ matrix.pkg }}pkg"
@@ -41,9 +35,6 @@ jobs:
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
-      - name: Install Subatomic client
-        run: sudo dnf install -y subatomic-cli
-
       - name: Upload packages to subatomic
         run: |
           subatomic-cli upload --prune \
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 59753a5545..18b3104a93 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,11 +6,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Install dependencies
-        run: dnf install -y rpmlint
       - name: Lint spec files
         run: rpmlint $(find anda -type f -name "*.spec" -type f)
diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index d475694999..1c3c38afcd 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -40,7 +40,7 @@ jobs:
     #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -55,12 +55,6 @@ jobs:
           else
             echo "EXISTS=false" >> $GITHUB_OUTPUT
           fi
-      - name: Install repositories
-        if: steps.check_files.outputs.EXISTS == 'true'
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
 
       - uses: terrapkg/anda-build@main
         if: steps.check_files.outputs.EXISTS == 'true'
@@ -70,10 +64,6 @@ jobs:
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
-      - name: Install Subatomic client
-        if: steps.check_files.outputs.EXISTS == 'true'
-        run: sudo dnf install -y subatomic-cli
-
       - name: Upload packages to subatomic
         if: steps.check_files.outputs.EXISTS == 'true'
         run: |
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index e37de2101b..325386f6ca 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -12,16 +12,9 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
     steps:
       - uses: actions/checkout@v3
-      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
-      - name: Install dependencies
-        run: |
-          sudo dnf install -y subatomic-cli
       - name: Push to subatomic
         run: |
           subatomic-cli upload-comps \
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 1fba08d61f..80eae35746 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -11,15 +11,9 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: registry.fedoraproject.org/fedora:37
+      image: ghcr.io/terrapkg/builder:nightly
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - name: Install packages
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
-          dnf install -y rpmdevtools git python anda
-
       - name: Checkout
         uses: actions/checkout@v3
         with: