-
Notifications
You must be signed in to change notification settings - Fork 30
Dockerfile updates: official versions of CMake and Python, tooling for prepare_release.py #238
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
Open
gilles-peskine-arm
wants to merge
13
commits into
main
Choose a base branch
from
dev/gilles-peskine-arm/git-in-docker
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+208
−86
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
There are `.cache` and `.config` directories created by pip and owned by root. This is probably not the right way to do things (the pip runs should probably have a `$HOME` setting that's consistent with the user they're running as, namely root), but not wrong either (there is no confidential data here anyway, or files that root would read). Don't touch arm-compilers, which has diverged and where it's less likely to matter given that that image is single-purpose. Signed-off-by: Gilles Peskine <[email protected]>
Make it possible to do git commit as part of the CI, for example to make a mock release. Don't touch arm-compilers, which has diverged and where it's less likely to matter given that that image is single-purpose. Signed-off-by: Gilles Peskine <[email protected]>
It has been years since `all.sh` supports `--list-components` and `--list-all-components`. If that isn't the case, let the build die with a backtrace instead of a semi-nice error message. Signed-off-by: Gilles Peskine <[email protected]>
Signed-off-by: Gilles Peskine <[email protected]>
Signed-off-by: Gilles Peskine <[email protected]>
If the job produces a release candidate tarball, make it available. Signed-off-by: Gilles Peskine <[email protected]>
Use the actively maintained Universal Ctags in Ubuntu versions where it's available, otherwise its dead parent Exuberant Ctags. Ctags was already in the images other than `arm-compilers` as a Recommends depenency of `abi-compliance-checker`, but since we're now using it directly, require it explicitly. Signed-off-by: Gilles Peskine <[email protected]>
We don't currently use it, but we're thinking of using it as a CMake backend. Signed-off-by: Gilles Peskine <[email protected]>
Less potential for something to go wrong when building extra stuff. Also, it's better for rebuild times to put the steps that don't change often early on. No code changes, only reordering. Signed-off-by: Gilles Peskine <[email protected]>
Install Python before other "higher-level" tools. No code changes, only reordering. Signed-off-by: Gilles Peskine <[email protected]>
Mbed TLS 3.6 LTS officially requires Python >=3.8, although we're still testing with (and therefore supporting) Python 3.6. At some point we'll switch our testing to 3.8. In preparation, make sure that Python >=3.8 is available on all Docker images. On Ubuntu 16.04, the most recent system Python is 3.5, and we install more recent version (3.6 and now also 3.8) with pyenv. On Ubuntu 18.04, `/usr/bin/python3` is 3.6 but 3.8 is available as a package, so install it. On Ubuntu 20.04, `/usr/bin/python3` is 3.8. Note that this commit merely makes Python 3.8 available. It does not change which Python version gets used in CI runs. Signed-off-by: Gilles Peskine <[email protected]>
In all Docker images, make sure we have the minimum version of CMake required by Mbed TLS 3.6 (CMake 3.10.2) and by TF-PSA-Crypto 1.0 and Mbed TLS 4.0 (CMake 3.20.2). In Ubuntu 18.04, the system cmake is 3.10.2. But still install one manually for uniformity. Note that this commit merely makes more CMake versions available. It does not change which CMake version gets used in CI runs. Signed-off-by: Gilles Peskine <[email protected]>
Signed-off-by: Gilles Peskine <[email protected]>
bensze01
approved these changes
Dec 11, 2025
Contributor
bensze01
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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.
CI runs at 7c19220: