Skip to content

Commit 038730a

Browse files
committed
Merge bitcoin/bitcoin#30501: lint: Add missing docker.io prefix to ci/lint_imagefile
fa7bee1 lint: Use git clone --depth=1 (MarcoFalke) fadb7c2 lint: Add missing docker.io prefix to ci/lint_imagefile (MarcoFalke) Pull request description: Currently, the `ci/lint_imagefile` may pick the wrong (non-native) architecture due to the missing prefix. For example, assuming the user has previously pulled an s390x image: ``` $ podman run --rm 'docker.io/s390x/debian:bookworm' dpkg --print-architecture exec /usr/bin/dpkg: exec format error ``` Now, `debian:bookworm` will refer to the same image: ``` $ podman run --rm 'debian:bookworm' dpkg --print-architecture exec /usr/bin/dpkg: exec format error ``` However, `docker.io/debian:bookworm` works fine: ``` $ podman run --rm 'docker.io/debian:bookworm' dpkg --print-architecture arm64 ``` (Also includes a nit-fix from bitcoin/bitcoin#30499 (comment)) ACKs for top commit: paplorinc: utACK fa7bee1 hebasto: ACK fa7bee1. Tree-SHA512: 4b6d562c14c67bef984ad25f6a3a1ef7f1059dc2859c603c45083b36bcacafa3248fc74176e2e4626fdc39507e9353f458ddbc4077f805c03e970df46af02224
2 parents c69ba20 + fa7bee1 commit 038730a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/lint/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ${CI_RETRY_EXE} apt-get install -y automake pkg-config libtool curl xz-utils git
2121
PYTHON_PATH="/python_build"
2222
if [ ! -d "${PYTHON_PATH}/bin" ]; then
2323
(
24-
${CI_RETRY_EXE} git clone https://github.com/pyenv/pyenv.git
24+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/pyenv/pyenv.git
2525
cd pyenv/plugins/python-build || exit 1
2626
./install.sh
2727
)

ci/lint_imagefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# See test/lint/README.md for usage.
66

7-
FROM debian:bookworm
7+
FROM docker.io/debian:bookworm
88

99
ENV DEBIAN_FRONTEND=noninteractive
1010
ENV LC_ALL=C.UTF-8

0 commit comments

Comments
 (0)