highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-08 03:33:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#30501: lint: Add missing docker.io prefix to ci/lint_imagefile

Browse Source 
fa7bee13bf lint: Use git clone --depth=1 (MarcoFalke)
fadb7c2a91 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 https://github.com/bitcoin/bitcoin/pull/30499#discussion_r1686470495)

ACKs for top commit:
  paplorinc:
    utACK fa7bee13bf
  hebasto:
    ACK fa7bee13bf.

Tree-SHA512: 4b6d562c14c67bef984ad25f6a3a1ef7f1059dc2859c603c45083b36bcacafa3248fc74176e2e4626fdc39507e9353f458ddbc4077f805c03e970df46af02224
This commit is contained in:
merge-script
2024-07-22 17:53:19 +01:00
parent c69ba20bce fa7bee13bf
commit 038730a795
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/lint/04_install.sh
View File

@@ -21,7 +21,7 @@ ${CI_RETRY_EXE} apt-get install -y automake pkg-config libtool curl xz-utils git
PYTHON_PATH="/python_build" PYTHON_PATH="/python_build"
if [ ! -d "${PYTHON_PATH}/bin" ]; then if [ ! -d "${PYTHON_PATH}/bin" ]; then
( (
${CI_RETRY_EXE} git clone https://github.com/pyenv/pyenv.git ${CI_RETRY_EXE} git clone --depth=1 https://github.com/pyenv/pyenv.git
cd pyenv/plugins/python-build || exit 1 cd pyenv/plugins/python-build || exit 1
./install.sh ./install.sh
) )

2
ci/lint_imagefile
View File

@@ -4,7 +4,7 @@
# See test/lint/README.md for usage. # See test/lint/README.md for usage.
FROM debian:bookworm FROM docker.io/debian:bookworm
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C.UTF-8 ENV LC_ALL=C.UTF-8