diff options
author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-09 10:22:18 +0100 |
---|---|---|
committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-11 10:49:18 +0100 |
commit | fa5dccba323e5d9ea6ed09819917a8d36ec7622a (patch) | |
tree | 76958f16e767f9339904d88a13ebc826485637ff /ci/test/05_before_script.sh | |
parent | b264410e012a61b103e1a03c43df4e17b9b75452 (diff) | |
download | bitcoin-fa5dccba323e5d9ea6ed09819917a8d36ec7622a.tar.xz |
scripted-diff: ci: Rework docker naming
DOCKER in names is confusingly used as synonym for "image", "container",
and "ci". Fix the confusion by picking the term that fits the context.
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s:$1:$2:g" $( git grep -l "$1" ) ; }
ren DOCKER_PACKAGES CI_BASE_PACKAGES
# This better reflects that they are the common base for all CI
# containers.
ren DOCKER_ID CI_CONTAINER_ID
# This is according to the documentation of "--detach , -d: Run
# container in background and print container ID".
ren DOCKER_NAME_TAG CI_IMAGE_NAME_TAG
# This avoids confusing with CONTAINER_NAME and clarifies that it is an
# image.
ren DOCKER_ADMIN CI_CONTAINER_CAP
# This clarifies that it is a capability added to the container.
ren DOCKER_CI_CMD_PREFIX CI_EXEC_CMD_PREFIX
# This brings it in line with the CI_EXEC naming.
-END VERIFY SCRIPT-
Diffstat (limited to 'ci/test/05_before_script.sh')
-rwxr-xr-x | ci/test/05_before_script.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index c0cf957f79..f49305597d 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -38,7 +38,7 @@ if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then fi if [ -z "$NO_DEPENDS" ]; then - if [[ $DOCKER_NAME_TAG == *centos* ]]; then + if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then # CentOS has problems building the depends if the config shell is not explicitly set # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to # an error as the first command is executed) |