Skip to content

Commit c69dcf9

Browse files
modification of changes
1 parent 1ff2a8e commit c69dcf9

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/docker-in-docker/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,11 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
461461
pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
462462
fi
463463
else
464-
compose_version="2.34.0"
464+
compose_version="${DOCKER_DASH_COMPOSE_VERSION#v}"
465465
docker_compose_url="https://github.com/docker/compose"
466466
find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
467467
echo "(*) Installing docker-compose ${compose_version}..."
468-
curl -fsSL "https://github.com/docker/compose/releases/download/2.34.0/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
468+
curl -fsSL "https://github.com/docker/compose/releases/download/compose_version/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
469469
echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
470470
fallback_compose "$docker_compose_url"
471471
}
@@ -496,7 +496,7 @@ fallback_compose-switch() {
496496
if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
497497
if type docker-compose > /dev/null 2>&1; then
498498
echo "(*) Installing compose-switch..."
499-
current_compose_path="$(command -v docker-compose)"
499+
current_compose_path="$(which docker-compose)"
500500
target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
501501
compose_switch_version="latest"
502502
compose_switch_url="https://github.com/docker/compose-switch"

0 commit comments

Comments
 (0)