File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff 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"
Original file line number Diff line number Diff line change 77export LC_ALL=C.UTF-8
88
99export 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"
1313export GOAL=" install"
1414export BITCOIN_CONFIG=" --enable-zmq --with-gui=qt5 --enable-reduce-exports"
1515export CONFIG_SHELL=" /bin/dash"
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
6464 DOCKER_EXEC dpkg --add-architecture " $DPKG_ADD_ARCH "
6565fi
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 "
7070elif [ " $CI_USE_APT_INSTALL " != " no" ]; then
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ if [[ $HOST = *-mingw32 ]]; then
4747 DOCKER_EXEC update-alternatives --set " ${HOST} -g++" \$\( which " ${HOST} -g++-posix" \)
4848fi
4949if [ -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)
You can’t perform that action at this time.
0 commit comments