Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

appredict-docker Release 2.0.0 #8

Merged
merged 5 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/docker-no-emulators.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .github/workflows/docker-with-emulators.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions appredict-chaste-libs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -26,4 +26,4 @@ RUN apt-get update && \

ENV HOME=/home/appredict
RUN useradd -ms /bin/bash -d $HOME appredict
USER appredict
USER appredict
8 changes: 4 additions & 4 deletions appredict-no-emulators/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

################################################################################
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion appredict-with-emulators/Dockerfile
Original file line number Diff line number Diff line change
@@ -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. #
Expand Down