diff --git a/.github/workflows/basesystem.yml b/.github/workflows/basesystem.yml index ee992ba..5d4bbc6 100644 --- a/.github/workflows/basesystem.yml +++ b/.github/workflows/basesystem.yml @@ -33,11 +33,11 @@ jobs: image: - {name: "debian-12", baseImg: "debian:12", - file: "storm-basesystem/Dockerfile.wohighs" + file: "storm-basesystem/Dockerfile" } - {name: "ubuntu-24.04", baseImg: "ubuntu:24.04", - file: "storm-basesystem/Dockerfile.wohighs" + file: "storm-basesystem/Dockerfile" } - {name: "debian-13", baseImg: "debian:13", diff --git a/storm-basesystem/Dockerfile b/storm-basesystem/Dockerfile index 1954c33..2fb9a26 100644 --- a/storm-basesystem/Dockerfile +++ b/storm-basesystem/Dockerfile @@ -27,6 +27,5 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \ libginac-dev \ libglpk-dev \ libgmp-dev \ - libhighs-dev \ libxerces-c-dev \ libz3-dev diff --git a/storm-basesystem/Dockerfile.wohighs b/storm-basesystem/Dockerfile.wohighs deleted file mode 100644 index c5c3c28..0000000 --- a/storm-basesystem/Dockerfile.wohighs +++ /dev/null @@ -1,33 +0,0 @@ -# Base Dockerfile for Storm dependencies -######################################## -# This image is without the HiGHS library which is not -# supported by Debian 12 and Ubuntu 24.04 -# The Docker image can be built by executing: -# docker build -t yourusername/storm-basesystem . -# A different Linux base system image can be set from the commandline with: -# --build-arg BASE_IMAGE= - -# Set Linux base image -ARG BASE_IMAGE=ubuntu:rolling -FROM $BASE_IMAGE -LABEL org.opencontainers.image.authors="dev@stormchecker.org" - -ENV DEBIAN_FRONTEND=noninteractive - -# Install dependencies -# - ca-certificates is needed for cloning from Github -# - all other dependencies are the recommended packages for Storm (see https://www.stormchecker.org/documentation/obtain-storm/dependencies.html#-debian-and--ubuntu) -RUN apt-get update -qq && apt-get install -y --no-install-recommends \ - automake \ - ca-certificates \ - build-essential \ - cmake \ - git \ - libarchive-dev \ - libboost-dev \ - libcln-dev \ - libginac-dev \ - libglpk-dev \ - libgmp-dev \ - libxerces-c-dev \ - libz3-dev