Cleanup and fix linter

Author: lzap

.github/workflows/rhel.yml

@@ -14,6 +14,7 @@ permissions:
 env:
   FOUNDRY_IMAGE: ghcr.io/${{ github.repository }}/foundry:${{ github.ref == 'refs/heads/main' && 'latest' || github.sha }}
   FOUNDRY_IMAGE_HEAD: ghcr.io/${{ github.repository }}/foundry:latest
+  # private cache registry
   CACHE_URL: ghcr.io/${{ github.repository }}/cache
 
 jobs:

build-and-push.sh

@@ -30,12 +30,8 @@ cp "Containerfile.comment" "Containerfile"
 echo "FROM ${FROM_REF}" >> "Containerfile"
 tail -n +2 "Containerfile.${CONTAINERFILE}" >> "Containerfile"
 
-if [ -n "${BUILDAH_ISOLATION:-}" ]; then
-  EXTRA_BUILD_ARGS="--isolation=$BUILDAH_ISOLATION"
-fi
-
 echo "Building $IMAGE"
-buildah build $EXTRA_BUILD_ARGS --layers --arch="$ARCH" \
+buildah build --layers --arch="$ARCH" \
   --build-arg CONTAINERFILE="Containerfile" \
   --from "${FROM_REF}" \
   -f "Containerfile.${CONTAINERFILE}" \

entrypoint.sh

@@ -3,7 +3,12 @@ set -xeuo pipefail
 
 cd "$(dirname "$0")"
 
-trap "e=\$?; subscription-manager unregister || true; exit \$e" EXIT
+cleanup() {
+  exit_code=$?
+  subscription-manager unregister || true
+  exit "$exit_code"
+}
+trap cleanup EXIT
 
 subscription-manager register --org "$RHSM_ORG" --activationkey "$RHSM_ACTIVATIONKEY" || true