From 8efacdcd3e00097c3c4c7a82232c27dd31c7b25d Mon Sep 17 00:00:00 2001
From: Pat Garrity <pfm@garrity.co>
Date: Sun, 24 Mar 2024 10:32:50 -0500
Subject: [PATCH] Rework in terms of a new CI image.

---
 .forgejo/workflows/pull_request.yaml | 3 +--
 build-and-push                       | 6 ++++--
 build-and-run                        | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.forgejo/workflows/pull_request.yaml b/.forgejo/workflows/pull_request.yaml
index de0d3e3..3d456a7 100644
--- a/.forgejo/workflows/pull_request.yaml
+++ b/.forgejo/workflows/pull_request.yaml
@@ -10,7 +10,7 @@ jobs:
   ci_image_build:
     runs-on: docker
     container:
-      image: mgoltzsche/podman:4.9-minimal
+      image: registry.garrity.co:8443/gs/ci-containers:latest
     name: 'Build and Test CI Image'
     env:
       IMAGE_TAG: registry.garrity.co:8443/gs/ci-scala:pre-release
@@ -25,6 +25,5 @@ jobs:
           pre-commit run --all-files
       - name: 'Build and Push Pre-Release'
         run: |
-          echo "Building and pushing pre-release: $IMAGE_TAG"
           podman build --tag "$IMAGE_TAG" .
           podman push "$IMAGE_TAG"
diff --git a/build-and-push b/build-and-push
index 5cb4694..b4992f7 100755
--- a/build-and-push
+++ b/build-and-push
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-podman build --tag registry.garrity.co:8443/gs/ci-scala:latest .
-podman push registry.garrity.co:8443/gs/ci-scala:latest
+readonly image_tag="registry.garrity.co:8443/gs/ci-scala:latest"
+
+podman build --tag "$image_tag" .
+podman push "$image_tag"
diff --git a/build-and-run b/build-and-run
index 3a1713e..93181e7 100755
--- a/build-and-run
+++ b/build-and-run
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-podman build --tag registry.garrity.co:8443/gs/ci-scala:latest .
-podman run --rm -it --entrypoint bash registry.garrity.co:8443/gs/ci-scala:latest
+readonly image_tag="registry.garrity.co:8443/gs/ci-scala:latest"
+
+podman build --tag "$image_tag" .
+podman run --rm -it --entrypoint bash "$image_tag"