Repository navigation
Commit 716d64c
committed
partial Merge bitcoin#28083: ci: Use DOCKER_BUILDKIT for lint image
fa2f18a ci: Use DOCKER_BUILDKIT for lint image (MarcoFalke)
Pull request description:
Currently the lint docker/podman image has many issues:
* It relies on an EOL debian version.
* It relies on a debian version different from the one used in the CI lint task.
* It relies on the legacy docker build command, which requires the user to make `cd ./ci/lint/` before the build step.
* It doesn't use the `.python-version` file, but a hardcoded version.
Fix all issues by using the recommended `DOCKER_BUILDKIT=1` to generate the image.
Also:
* Rename `/tmp/python` to `/python_build`.
* Compress all `pip install` commands into one.
* Bump `.python-version`.
ACKs for top commit:
jamesob:
ACK bitcoin@fa2f18a
Tree-SHA512: 804b384904ad753845667998841cc7825f4229933ca2c42af021384713486ec3cca80ba58612d37557fba7ee1921439dacca5e1236aac0557dd75bd9a2f1875d
Dash adaptations:
- ci/lint/04_install.sh: adopted upstream's single multi-line `pip3 install` invocation but kept Dash's pinned versions (codespell 2.2.1, flake8 5.0.4, mypy 0.981, pyzmq 24.0.1) and Dash's `# NOTE: BUMP ALSO contrib/containers/ci/ci-slim.Dockerfile` comment; upstream's version bumps come from a separate commit Dash has not backported and are out of scope here.
- .python-version: left at Dash's 3.10.19 rather than taking upstream's 3.8.16->3.8.17 bump; Dash is already ahead of upstream on this file.
- ci/lint/Dockerfile: Dash's copy differed from upstream (FROM python:3.10.19-bookworm instead of python:3.8-buster), but upstream deletes the file wholesale in favour of ci/lint_imagefile, so the Dash variant was removed too.
- ci/lint_imagefile: taken verbatim from upstream, including `WORKDIR /bitcoin`; Dash's existing lint tooling (docker-entrypoint.sh safe.directory, test/lint/README.md mount path and `bitcoin-linter` tag) already uses /bitcoin, and upstream's commit does not rename it, so no rebranding was applied.
Omitted (partial backport):
- .cirrus.yml: Dash deleted .cirrus.yml from its tree (it uses GitHub Actions / GitLab CI, not Cirrus). The cherry-pick re-introduced upstream's whole file as a delete/modify conflict; resolved by keeping it deleted, so the python_cache folder change /tmp/python -> /python_build has no home in Dash.1 parent abf223e commit 716d64c
5 files changed
Lines changed: 45 additions & 56 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
34 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
35 | 33 | | |
36 | 34 | | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
8 | 10 | | |
9 | 11 | | |
10 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
| 10 | + | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
0 commit comments