diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index ebd1ebc0..871d2ce6 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -50,14 +50,14 @@ jobs: strategy: matrix: buildType: - - {name: "Release", imageName : "randriu/paynt", dockerTag: "mdp", setupArgs: ""} + - {name: "Release", imageName : "randriu/paynt", dockerTag: "mdp", baseImage : "randriu/stormpy-alex", setupArgs: "--disable-smg"} fail-fast: false if: github.ref == 'refs/heads/mdp' steps: - name: Git clone uses: actions/checkout@v4 - name: Build paynt image from Dockerfile - run: docker build -t ${{ matrix.buildType.imageName }}:${{ matrix.buildType.dockerTag }} . --build-arg BASE_IMG=randriu/stormpy-alex --build-arg setup_args=${{ matrix.buildType.setupArgs }} --build-arg no_threads=${NR_JOBS} + run: docker build -t ${{ matrix.buildType.imageName }}:${{matrix.buildType.dockerTag}} . --build-arg base_image=${{matrix.buildType.imageBase}} --build-arg setup_args=${{ matrix.buildType.setupArgs }} --build-arg no_threads=${NR_JOBS} - name: Login into docker # Only login if using mdp on original repo (and not for pull requests or forks) if: github.repository_owner == 'randriu' diff --git a/Dockerfile b/Dockerfile index da323a2c..548a32e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # command-line arguments can be specified e.g. as follows: --build-arg no_threads=8 # base image -ARG BASE_IMG=movesrwth/stormpy:ci -FROM $BASE_IMG +ARG base_image=movesrwth/stormpy:ci +FROM $base_image # additional arguments for compiling payntbind ARG setup_args=""