Merge branch 'master' of github.com:nevillegrech/gigahorse-toolchain

docker/linux/Dockerfile

@@ -1,30 +1,9 @@
-FROM ubuntu:22.04
+FROM ghcr.io/nevillegrech/gigahorse-toolchain-deps-souffle24:latest
 
 USER root
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install some essentials
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
-    build-essential \
-    libboost-all-dev \
-    wget
-
-# Install python3
-RUN apt-get install python3-dev python3-pip -y
-
-# Install souffle
-RUN wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg
-RUN echo "deb [signed-by=/usr/share/keyrings/souffle-archive-keyring.gpg] https://souffle-lang.github.io/ppa/ubuntu/ stable main" | tee /etc/apt/sources.list.d/souffle.list
-RUN apt-get update && apt-get install souffle -y
-
-# Dependencies for Gigahorse output viz
-RUN apt-get update && apt-get install -y graphviz
-RUN apt-get update && apt-get install -y libssl-dev
-
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install pydot
-
 # Set up a non-root 'gigahorse' user
 RUN groupadd -r gigahorse && useradd -ms /bin/bash -g gigahorse gigahorse
 
@@ -44,3 +23,9 @@ RUN cd /opt/gigahorse/gigahorse-toolchain/souffle-addon && make libsoufflenum.so
 
 CMD ["-h"]
 ENTRYPOINT ["/opt/gigahorse/gigahorse-toolchain/gigahorse.py"]
+
+# Commenting it out, to be uncommented and to debug and run as interactive container
+# # Start gigahorse user in logic subdir ready to run Gigahorse
+# EXPOSE 8888
+# USER gigahorse
+# WORKDIR /opt/gigahorse/gigahorse-toolchain