More flexible Dockerfile, and restore pushing docker containers for master #4400
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
connorjward
reviewed
Jun 25, 2025
docker/Dockerfile.vanilla
Outdated
| # BRANCH: | ||
| # The Firedrake branch to install from. The `firedrake-configure` script from this branch will be used. | ||
| # - If BRANCH == "release": installs the latest firedrake release and the corresponding PETSc release. | ||
| # - If BRANCH != "release": installs that Firedrake branch and the latest PETSc master branch. |
There was a problem hiding this comment.
This introduces some strange implicit behaviour. I feel like it might be better if the Firedrake and PETSc branches were specified separately (also it's PETSc main, not master).
Similarly it might make sense to have DEV={0,1} to distinguish whether we do a release- or master-style build.
There was a problem hiding this comment.
Changed to a single argument TARGET that can either be:
releasefor the latest release branch build.<tag>e.g.2025.4.2for a specific release.masterfor the latest master branch build.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There seems to be some appetite for people building their own Firedrake Docker containers. The current Dockerfiles are very static in what they can do - apart from allowing different ARCH options. This PR makes the Dockerfile slightly more flexible by allowing passing a particular branch to install from:
releasethen the behaviour is unchanged - Firedrake and PETSc are both built from the corresponding release branches.firedrake-configureis downloaded from the specified branch, PETSc is installed from the latestmainbranch, and Firedrake is installed from the latest version of the specified branch.TODO:
Some downstream repositories want to test against
masterrather thanrelease, or test against bothmasterandrelease. However, we no longer build a Docker container on pushes to master. Being able to specify a non-release branch to the Dockerfile means we can use the same Dockerfile to build containers for both release and master.