Skip to content

Commit 46a9c73

Browse files
fanquakefanquake
committed
Merge bitcoin#31906: ci: Switch to gcr.io mirror to avoid rate limits
fa8de47 ci: Switch to gcr.io mirror to avoid rate limits (MarcoFalke) Pull request description: dockerhub seems to have recently started to increase their rate limits further, beyond what is documented, even to the extent where pulling the same image twice at the same time results in a ban. See bitcoin#31797 (comment) Fix all issues by just using another mirror, as documented in https://cloud.google.com/artifact-registry/docs/pull-cached-dockerhub-images Fixes bitcoin#31797 ACKs for top commit: 0xB10C: ACK fa8de47 Tree-SHA512: 83d021059772adf473bd6c01443b53f787259e873016238869d716992a2451e18ab98f034e1ac9cd05f2ddbe45eba86cb9ea690be8e16b69c87dd8649d7ac7d4
2 parents 82ba925 + fa8de47 commit 46a9c73

17 files changed

+17
-17
lines changed

‎ci/lint_imagefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

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

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

‎ci/test/00_setup_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2022 The Bitcoin Core developers
3+
# Copyright (c) 2019-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

‎ci/test/00_setup_env_arm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export HOST=arm-linux-gnueabihf
1010
export DPKG_ADD_ARCH="armhf"
1111
export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
1212
export CONTAINER_NAME=ci_arm_linux
13-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.3, similar to guix) can cross-compile
13+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:noble" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.3, similar to guix) can cross-compile
1414
export CI_IMAGE_PLATFORM="linux/arm64"
1515
export USE_BUSY_BOX=true
1616
export RUN_UNIT_TESTS=true

‎ci/test/00_setup_env_i686_multiprocess.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_multiprocess
11-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
11+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1212
export CI_IMAGE_PLATFORM="linux/amd64"
1313
export PACKAGES="llvm clang g++-multilib"
1414
export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"

‎ci/test/00_setup_env_mac_cross.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
1010

1111
export CONTAINER_NAME=ci_macos_cross
12-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
12+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1313
export HOST=x86_64-apple-darwin
1414
export PACKAGES="clang lld llvm zip"
1515
export XCODE_VERSION=15.0

‎ci/test/00_setup_env_native_asan.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010

1111
# Only install BCC tracing packages in CI. Container has to match the host for BCC to work.
1212
if [[ "${INSTALL_BCC_TRACING_TOOLS}" == "true" ]]; then

‎ci/test/00_setup_env_native_fuzz.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz
1111
export APT_LLVM_V="20"
1212
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libevent-dev libboost-dev libsqlite3-dev"

‎ci/test/00_setup_env_native_fuzz_with_msan.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
LIBCXX_DIR="/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"

‎ci/test/00_setup_env_native_fuzz_with_valgrind.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
1111
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libevent-dev libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1

‎ci/test/00_setup_env_native_msan.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
LIBCXX_DIR="/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"

‎ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel
10-
export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm"
10+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:bookworm"
1111
# Use minimum supported python3.10 (or best-effort 3.11) and clang-16, see doc/dependencies.md
1212
export PACKAGES="python3-zmq clang-16 llvm-16 libc++abi-16-dev libc++-16-dev"
1313
export DEP_OPTS="NO_WALLET=1 CC=clang-16 CXX='clang++-16 -stdlib=libc++'"

‎ci/test/00_setup_env_native_previous_releases.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_previous_releases
10-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
10+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:22.04"
1111
# Use minimum supported python3.10 and gcc-11, see doc/dependencies.md
1212
export PACKAGES="gcc-11 g++-11 python3-zmq"
1313
export DEP_OPTS="DEBUG=1 CC=gcc-11 CXX=g++-11"

‎ci/test/00_setup_env_native_tidy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_tidy
1111
export TIDY_LLVM_V="19"
1212
export APT_LLVM_V="${TIDY_LLVM_V}"

‎ci/test/00_setup_env_native_tsan.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
10+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1111
export APT_LLVM_V="20"
1212
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libc++abi-${APT_LLVM_V}-dev libc++-${APT_LLVM_V}-dev python3-zmq"
1313
export DEP_OPTS="CC=clang-${APT_LLVM_V} CXX='clang++-${APT_LLVM_V} -stdlib=libc++'"

‎ci/test/00_setup_env_native_valgrind.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
9+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_valgrind
1111
export PACKAGES="valgrind clang-16 llvm-16 libclang-rt-16-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1

‎ci/test/00_setup_env_s390x.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export HOST=s390x-linux-gnu
1010
export PACKAGES="python3-zmq"
1111
export CONTAINER_NAME=ci_s390x
12-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
12+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
1313
export CI_IMAGE_PLATFORM="linux/s390x"
1414
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1515
export RUN_FUNCTIONAL_TESTS=true

‎ci/test/00_setup_env_win64.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that g++-mingw-w64-x86-64-posix (version 13.2, similar to guix) can cross-compile
10+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:noble" # Check that g++-mingw-w64-x86-64-posix (version 13.2, similar to guix) can cross-compile
1111
export CI_IMAGE_PLATFORM="linux/amd64"
1212
export HOST=x86_64-w64-mingw32
1313
export DPKG_ADD_ARCH="i386"

0 commit comments

Comments
 (0)