diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash index ae14ecf..e3b9494 100644 --- a/test/system/libs/helpers.bash +++ b/test/system/libs/helpers.bash @@ -3,16 +3,16 @@ load 'libs/bats-support/load' load 'libs/bats-assert/load' -readonly CONTAINERS_STORAGE_CONF="${BATS_SUITE_TMPDIR}/storage.conf" +readonly CONTAINERS_STORAGE_CONF="$BATS_SUITE_TMPDIR/storage.conf" export CONTAINERS_STORAGE_CONF # Helpful globals -readonly IMAGE_CACHE_DIR="${BATS_SUITE_TMPDIR}/image-cache" -readonly TOOLBX_ROOTLESS_STORAGE_PATH="${BATS_SUITE_TMPDIR}/storage" -readonly ROOTLESS_PODMAN_RUNROOT_DIR="${BATS_SUITE_TMPDIR}/runroot" -readonly DOCKER_REG_ROOT="${BATS_SUITE_TMPDIR}/docker-registry-root" -readonly DOCKER_REG_CERTS_DIR="${BATS_SUITE_TMPDIR}/certs" -readonly DOCKER_REG_AUTH_DIR="${BATS_SUITE_TMPDIR}/auth" +readonly IMAGE_CACHE_DIR="$BATS_SUITE_TMPDIR/image-cache" +readonly TOOLBX_ROOTLESS_STORAGE_PATH="$BATS_SUITE_TMPDIR/storage" +readonly ROOTLESS_PODMAN_RUNROOT_DIR="$BATS_SUITE_TMPDIR/runroot" +readonly DOCKER_REG_ROOT="$BATS_SUITE_TMPDIR/docker-registry-root" +readonly DOCKER_REG_CERTS_DIR="$BATS_SUITE_TMPDIR/certs" +readonly DOCKER_REG_AUTH_DIR="$BATS_SUITE_TMPDIR/auth" readonly DOCKER_REG_URI="localhost:50000" readonly DOCKER_REG_NAME="docker-registry" @@ -43,7 +43,7 @@ function _setup_environment() { function _setup_containers_storage() { # Set up a storage config file for PODMAN - echo -e "[storage]\n driver = \"overlay\"\n rootless_storage_path = \"${TOOLBX_ROOTLESS_STORAGE_PATH}\"\n runroot = \"${ROOTLESS_PODMAN_RUNROOT_DIR}\"\n" > "${CONTAINERS_STORAGE_CONF}" + echo -e "[storage]\n driver = \"overlay\"\n rootless_storage_path = \"$TOOLBX_ROOTLESS_STORAGE_PATH\"\n runroot = \"$ROOTLESS_PODMAN_RUNROOT_DIR\"\n" > "$CONTAINERS_STORAGE_CONF" }