diff options
| author | fanquake <fanquake@gmail.com> | 2023-07-18 16:40:26 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-07-18 16:40:39 +0100 |
| commit | c6a338b67e8e7848e6f42329a8b0bf3add16ad51 (patch) | |
| tree | de3be474dafd456aa2abdc6e6195b6cfc87c9bbc /test | |
| parent | 673acab223c0f896767b1ae784659df9f95452ae (diff) | |
| parent | fa2f18ad8e386f067c2d7d5362f6b4dd84c295a0 (diff) | |
| download | bitcoin-c6a338b67e8e7848e6f42329a8b0bf3add16ad51.tar.xz | |
Merge bitcoin/bitcoin#28083: ci: Use DOCKER_BUILDKIT for lint image
fa2f18ad8e386f067c2d7d5362f6b4dd84c295a0 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 https://github.com/bitcoin/bitcoin/pull/28083/commits/fa2f18ad8e386f067c2d7d5362f6b4dd84c295a0
Tree-SHA512: 804b384904ad753845667998841cc7825f4229933ca2c42af021384713486ec3cca80ba58612d37557fba7ee1921439dacca5e1236aac0557dd75bd9a2f1875d
Diffstat (limited to 'test')
| -rw-r--r-- | test/lint/README.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/lint/README.md b/test/lint/README.md index 704922d7ab..d9cfeb50ed 100644 --- a/test/lint/README.md +++ b/test/lint/README.md @@ -7,10 +7,8 @@ To run linters locally with the same versions as the CI environment, use the inc Dockerfile: ```sh -cd ./ci/lint -docker build -t bitcoin-linter . +DOCKER_BUILDKIT=1 docker build -t bitcoin-linter --file "./ci/lint_imagefile" ./ -cd /root/of/bitcoin/repo docker run --rm -v $(pwd):/bitcoin -it bitcoin-linter ``` |