Skip to content

Commit fa5457e

Browse files
author
MarcoFalke
committed
ci: Bump CentOS 8 image
1 parent fcac16f commit fa5457e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ task:
188188
name: '32-bit + dash [gui] [CentOS 8]'
189189
<< : *GLOBAL_TASK_TEMPLATE
190190
container:
191-
image: centos:8
191+
image: quay.io/centos/centos:stream8
192192
env:
193193
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
194194
PACKAGE_MANAGER_INSTALL: "yum install -y"

ci/test/00_setup_env_i686_centos.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
10-
export CONTAINER_NAME=ci_i686_centos_8
11-
export DOCKER_NAME_TAG=centos:8
12-
export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 dash rsync coreutils bison"
10+
export CONTAINER_NAME=ci_i686_centos
11+
export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
12+
export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 xz procps-ng dash rsync coreutils bison"
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"
1515
export CONFIG_SHELL="/bin/dash"

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
6464
DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
6565
fi
6666

67-
if [[ $DOCKER_NAME_TAG == centos* ]]; then
67+
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
6868
${CI_RETRY_EXE} DOCKER_EXEC dnf -y install epel-release
6969
${CI_RETRY_EXE} DOCKER_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
7070
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then

ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [[ $HOST = *-mingw32 ]]; then
4747
DOCKER_EXEC update-alternatives --set "${HOST}-g++" \$\(which "${HOST}-g++-posix"\)
4848
fi
4949
if [ -z "$NO_DEPENDS" ]; then
50-
if [[ $DOCKER_NAME_TAG == centos* ]]; then
50+
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
5151
# CentOS has problems building the depends if the config shell is not explicitly set
5252
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
5353
# an error as the first command is executed)

0 commit comments

Comments
 (0)