Skip to content

Commit fa33354

Browse files
author
MarcoFalke
committed
ci: Remove /ro_base bind mount
Just set the bind mount to BASE_READ_ONLY_DIR, which allows to drop one line of code and makes the code easier to understand.
1 parent fa0df9d commit fa33354

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ci/test/04_install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2018-2022 The Bitcoin Core developers
3+
# Copyright (c) 2018-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

@@ -32,13 +32,13 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
3232

3333
# shellcheck disable=SC2086
3434
CI_CONTAINER_ID=$(docker run $CI_CONTAINER_CAP --rm --interactive --detach --tty \
35-
--mount type=bind,src=$BASE_READ_ONLY_DIR,dst=/ro_base,readonly \
35+
--mount "type=bind,src=$BASE_READ_ONLY_DIR,dst=$BASE_READ_ONLY_DIR,readonly" \
3636
--mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \
3737
--mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \
3838
--mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \
3939
--env-file /tmp/env \
40-
--name $CONTAINER_NAME \
41-
$CONTAINER_NAME)
40+
--name "$CONTAINER_NAME" \
41+
"$CONTAINER_NAME")
4242
export CI_CONTAINER_ID
4343
export CI_EXEC_CMD_PREFIX="docker exec ${CI_CONTAINER_ID}"
4444
else
@@ -56,7 +56,7 @@ export -f CI_EXEC
5656
# Normalize all folders to BASE_ROOT_DIR
5757
CI_EXEC rsync --archive --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
5858
CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh"
59-
CI_EXEC rsync --archive --stats --human-readable /ro_base/ "${BASE_ROOT_DIR}" || echo "Nothing to copy from ro_base"
59+
6060
# Fixes permission issues when there is a container UID/GID mismatch with the owner
6161
# of the git source code directory.
6262
CI_EXEC git config --global --add safe.directory \"*\"

0 commit comments

Comments
 (0)