From 3b0be08c55fab1e78aa5bdffcbb4af807acd215d Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 10:32:01 +0800 Subject: [PATCH] update for docker compose typo for redis image --- devbox/devbox.local/cli/devbox | 9 ++++----- .../devbox.local/cli/docker-compose.dev.arm64.new.yaml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox index 457c57d..4789b29 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/devbox.local/cli/devbox @@ -895,12 +895,12 @@ devbox_init_command() { popd > /dev/null fi else - if [[ ! $USE_CUSTOM_REPOSITORY =~ ^(https:\/\/|git@|git:\/\/|file:\/\/\/)[^ ]+\.git$ ]]; then - echo "ERROR: Invalid custom repository URL. Please provide a valid URL." - echo "==> [INIT] DevBox environment initialization completed successfully, but access to the custom repository failed." - exit 1 + if ! echo "$USE_CUSTOM_REPOSITORY" | grep -Eq '^(https:\/\/|git@|git:\/\/|file:\/\/\/)[^ ]+\.git$'; then + echo "ERROR: Invalid custom repository URL. Please provide a valid URL." + exit 1 fi + # Test if the user can access the custom repository echo "==> Testing access to custom repository..." if ! git ls-remote "$USE_CUSTOM_REPOSITORY" &>/dev/null; then @@ -1093,7 +1093,6 @@ echo "$USE_LOCAL_COMPONENT" > "$WORKING_HOME/.use-local-component" pushd $WORKING_HOME - IS_START_FRONTEND=false # Make a user input (Y/N) to continue pull freeleaps.com code and start if N then exit diff --git a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml index 3ef6e4d..8ffa650 100644 --- a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml +++ b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml @@ -64,7 +64,7 @@ services: redis: platform: linux/${ARCH:-arm64} container_name: freeleaps2-redis - image: rabbitmq:latest + image: redis:latest restart: always ports: - 6379:6379