From 1d0ef22da03fe597e63f640c7a5d081bae9b570b Mon Sep 17 00:00:00 2001
From: Michal Podhradsky <mpodhradsky@galois.com>
Date: Mon, 11 Nov 2024 11:37:21 -0800
Subject: [PATCH] Fix the docker test script, and update z3 installation

---
 .github/workflows/docker.yml |  2 +-
 Dockerfile.redhat            | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d706c6f08..97f8359aa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -94,4 +94,4 @@ jobs:
     - name: Run CN CI tests
       run: |
         docker pull ${{env.CERBERUS_IMAGE_ID}}:${{ matrix.tag }}
-        docker run -v $PWD:/work ${{env.CERBERUS_IMAGE_ID}}:${{ matrix.tag }} tests/run-cn.sh
+        docker run -v $PWD:/work ${{env.CERBERUS_IMAGE_ID}}:${{ matrix.tag }} bash tests/run-cn.sh
diff --git a/Dockerfile.redhat b/Dockerfile.redhat
index d485da817..697323522 100644
--- a/Dockerfile.redhat
+++ b/Dockerfile.redhat
@@ -7,19 +7,6 @@ RUN yum update -y && \
     git perl wget ca-certificates \
     mpfr-devel gmp-devel m4
 
-# Install additional FEDORA packages
-# from https://www.cyberciti.biz/faq/install-epel-repo-on-an-rhel-8-x/
-# NOTE: Import the GPG key is needed, see https://www.redhat.com/en/blog/rpm-gpg-verify-packages
-# NOTE: Currently the FEDORA packages are needed only for Z3
-# NOTE: We might have to eventually use *only* RedHat packages
-# which would mean installing Z3 directly from the release page
-RUN wget https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9 && \
-    rpm --import RPM-GPG-KEY-EPEL-9 && \
-    rm RPM-GPG-KEY-EPEL-9 && \
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
-    yum update -y && \
-    yum install -y z3
-
 # Install OPAM
 # See https://opam.ocaml.org/doc/1.2/Install.html
 RUN curl -fsSL https://opam.ocaml.org/install.sh | sh
@@ -30,6 +17,7 @@ RUN opam init --disable-sandboxing
 ADD . /opt/cerberus
 WORKDIR /opt/cerberus
 RUN opam install --deps-only  ./cerberus-lib.opam ./cn.opam
+RUN opam install z3
 
 RUN eval `opam env` \
   && make install_cn