diff --git a/.github/workflows/docker-no-emulators.yml b/.github/workflows/docker-no-emulators.yml index ccc7ac2..3b37d51 100644 --- a/.github/workflows/docker-no-emulators.yml +++ b/.github/workflows/docker-no-emulators.yml @@ -29,6 +29,10 @@ jobs: context: ./appredict-no-emulators/ pull: true push: true + build-args: | + appredict_tag=v2024.1 + chaste_tag=2024.1 + build_processors=4 tags: | cardiacmodelling/appredict-no-emulators:2.0.0 cardiacmodelling/appredict-no-emulators:latest diff --git a/.github/workflows/docker-with-emulators.yml b/.github/workflows/docker-with-emulators.yml index 2124746..c43506f 100644 --- a/.github/workflows/docker-with-emulators.yml +++ b/.github/workflows/docker-with-emulators.yml @@ -29,6 +29,8 @@ jobs: context: ./appredict-with-emulators/ pull: true push: true + build-args: | + build_processors=4 tags: | cardiacmodelling/appredict-with-emulators:2.0.0 cardiacmodelling/appredict-with-emulators:latest diff --git a/LICENSE b/LICENSE index 35d978a..f25a3a0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ BSD 3-Clause License Unless otherwise noted, all files within this distribution are -Copyright (c) 2013-2021 University of Oxford, 2016-2021 University College London, and 2016-2021 University of Nottingham. +Copyright (c) 2013-2021 University of Oxford, 2016-2021 University College London, and 2016-2024 University of Nottingham. All rights reserved. University of Oxford means the Chancellor, Masters and Scholars of the diff --git a/appredict-chaste-libs/Dockerfile b/appredict-chaste-libs/Dockerfile index 41bfca1..c419349 100644 --- a/appredict-chaste-libs/Dockerfile +++ b/appredict-chaste-libs/Dockerfile @@ -1,13 +1,13 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim USER root -RUN echo "deb http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bullseye main contrib non-free" >> /etc/apt/sources.list # Install dependencies with recommended, applicable suggested and other useful packages RUN apt-get update && \ - apt-get install -y g++ cmake && \ - apt-get install -y --no-install-recommends \ + apt-get install -y g++ cmake && \ + apt-get install -y --no-install-recommends \ wget \ git \ petsc-dev \ @@ -26,4 +26,4 @@ RUN apt-get update && \ ENV HOME=/home/appredict RUN useradd -ms /bin/bash -d $HOME appredict -USER appredict \ No newline at end of file +USER appredict diff --git a/appredict-no-emulators/Dockerfile b/appredict-no-emulators/Dockerfile index be52e4a..0f943e5 100644 --- a/appredict-no-emulators/Dockerfile +++ b/appredict-no-emulators/Dockerfile @@ -1,11 +1,11 @@ -FROM cardiacmodelling/appredict-chaste-libs:1.0.0 +FROM cardiacmodelling/appredict-chaste-libs:2.0.0 ################################################################################ # Modifiable (e.g. via command line) args. # ################################################################################ -ARG appredict_tag=v2021.1 -ARG chaste_tag=2021.1 +ARG appredict_tag=v2024.1 +ARG chaste_tag=2024.1 ARG build_processors=1 ################################################################################ @@ -37,7 +37,7 @@ RUN find . ! -name shannon_wang_puglisi_weber_bers_2004.cellml ! -name ten_tussc RUN mkdir -p ${dir_build} WORKDIR ${dir_build} -RUN cmake -j ${build_processors} \ +RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DChaste_ERROR_ON_WARNING=OFF \ -DChaste_UPDATE_PROVENANCE=ON \ diff --git a/appredict-with-emulators/Dockerfile b/appredict-with-emulators/Dockerfile index 26b1c22..e4db6a6 100644 --- a/appredict-with-emulators/Dockerfile +++ b/appredict-with-emulators/Dockerfile @@ -1,4 +1,4 @@ -FROM cardiacmodelling/appredict-no-emulators:1.0.0 +FROM cardiacmodelling/appredict-no-emulators:2.0.0 ################################################################################ # Modifiable (e.g. via command line) args. #