Skip to content

Commit 36ce722

Browse files
authored
Add release version of Dockerfile and use in workflow (#171)
Currently, the release Docker build doesn't actually use the Firedrake `release` branch. The quickest way to fix this is to create a second Dockerfile, which should do the trick for now.
1 parent 1595b68 commit 36ce722

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

.github/workflows/docker_firedrake-parmmg_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
# starting from firedrake-parmmg-base, build firedrake-parmmg image
5858
# which includes Animate, Movement, Goalie, and Thetis packages
59-
dockerfile-path: 'docker/Dockerfile.firedrake-parmmg'
59+
dockerfile-path: 'docker/Dockerfile.firedrake-parmmg_release'
6060
firedrake-branch: 'release'
6161
docker-image-tag: 'ghcr.io/mesh-adaptation/firedrake-parmmg:release'
6262
load-docker-image-artifact: 'firedrake-parmmg-base-release'
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Dockerfile that provides Firedrake release built with (Par)Mmg support
2+
# and with the main mesh-adaptation packages installed in /root
3+
FROM ghcr.io/mesh-adaptation/firedrake-parmmg-base:release
4+
5+
# Which branch is to be used across all repositories?
6+
ARG BRANCH="main"
7+
8+
WORKDIR /root
9+
10+
# Install Thetis
11+
RUN pip install --verbose --src . -e git+https://github.com/thetisproject/thetis.git#egg=thetis
12+
13+
# Install adapt_common, Animate, Movement, Goalie and their dependencies
14+
RUN git clone https://github.com/mesh-adaptation/adapt_common.git && \
15+
git clone https://github.com/mesh-adaptation/animate.git && \
16+
git clone https://github.com/mesh-adaptation/movement.git && \
17+
git clone https://github.com/mesh-adaptation/goalie.git && \
18+
cd animate && git checkout ${BRANCH} && cd .. && \
19+
cd movement && git checkout ${BRANCH} && cd .. && \
20+
cd goalie && git checkout ${BRANCH} && cd .. && \
21+
cd animate && git submodule init && git submodule update && cd .. && \
22+
cd movement && git submodule init && git submodule update && cd .. && \
23+
pip install -e adapt_common[dev] && \
24+
pip install -e animate[dev] && \
25+
pip install -e movement[dev] && \
26+
pip install -e goalie[dev]

0 commit comments

Comments
 (0)