From a8c52c62dc834c57c8deb2011a2a6bbb1ffc9da5 Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 10:10:15 +0800 Subject: [PATCH 1/6] Update for devbox -h usage description --- devbox/devbox.local/cli/devbox | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox index ca607ed..0c30901 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/devbox.local/cli/devbox @@ -128,16 +128,39 @@ devbox_usage() { printf "Command\n" printf " devbox : DevBox Command Line Tool for managing the local development environment.\n\n" + printf "Usage\n" + printf " devbox : Interactive mode to initialize development environment\n" + printf " devbox freeleaps : Initialize Freeleaps.com development environment\n" + printf " devbox : Initialize specific product development environment\n\n" + printf "Arguments\n" - printf " COMMAND [Required] : Specify the command to execute (e.g., init, deinit, start, stop, status, restart).\n\n" + printf " COMMAND [Required] : Specify the command to execute.\n" + printf " init, i : Initialize the local development environment.\n" + printf " deinit, d : De-initialize the local development environment.\n" + printf " start, s : Start services in the local development environment.\n" + printf " stop, p : Stop services in the local development environment.\n" + printf " status, t : Display status of services in the local environment.\n" + printf " restart, r : Restart services in the local environment.\n\n" printf "Global Arguments\n" printf " --help, -h : Show this help message and exit.\n" printf " --version, -v : Show version number.\n\n" printf "Examples\n" + printf " Initialize development environment interactively:\n" + printf " devbox\n\n" + printf " Initialize Freeleaps.com development environment:\n" + printf " devbox freeleaps\n\n" + printf " Initialize specific product development environment:\n" + printf " devbox \n\n" + printf " Initialize development environment with command:\n" + printf " devbox init\n\n" printf " Display help for the 'init' command:\n" printf " devbox init --help\n\n" + printf " Start all services:\n" + printf " devbox start\n\n" + printf " Start specific service:\n" + printf " devbox start --component=backend\n\n" printf " Display version information:\n" printf " devbox --version\n" echo @@ -1775,12 +1798,17 @@ if [[ "${START_FRONTEND}" == "true" ]]; then echo '============================================' pushd /home/devbox/freeleaps/frontend + echo "==> Installing dependencies..." + npm install lodash + + # echo "==> Starting frontend service..." baseline_file=\$(mktemp) echo "==> Creating a baseline file for the frontend service..." git status -s > "\$baseline_file" echo "==> Baseline file created: \$baseline_file" + # Check if the frontend service is already running according to the package.json and pnpm-lock.yaml files timestamps if [[ ! -d "node_modules" || "package.json" -nt "node_modules" || "pnpm-lock.yaml" -nt "node_modules" ]]; then echo "==> Installing/Updating frontend dependencies..." From 11fde3b99a72d04268c51cc15a4373f6c6983497 Mon Sep 17 00:00:00 2001 From: Tianyong Qiu Date: Tue, 11 Mar 2025 03:53:26 +0000 Subject: [PATCH 2/6] Deleted freeleaps @ ca58e0b8 --- devbox/devbox.local/cli/freeleaps | 1 - 1 file changed, 1 deletion(-) delete mode 160000 devbox/devbox.local/cli/freeleaps diff --git a/devbox/devbox.local/cli/freeleaps b/devbox/devbox.local/cli/freeleaps deleted file mode 160000 index ca58e0b..0000000 --- a/devbox/devbox.local/cli/freeleaps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca58e0b8f9d91c297da64c440b799ff913cb24f2 From 4b783135e069e140b816171122ac17194df79996 Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 12:20:23 +0800 Subject: [PATCH 3/6] Update for product id input when user start with ./devbox --- devbox/devbox.local/cli/devbox | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox index 0c30901..bc8fb33 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/devbox.local/cli/devbox @@ -94,6 +94,13 @@ devbox_init_guidance() { add_arg "--use-custom-repository" "$use_custom_repository" ;; 2) + # Ask user for product_id + read -p "Enter your product_id: " product_id + if [[ -z $product_id ]]; then + printf "Product ID is required.\n" + exit 1 + fi + # Ask user for Freeleaps.com username and password read -p "Enter your Freeleaps.com username: " freeleaps_username read -s -p "Enter your Freeleaps.com password: " freeleaps_password From 15c4dbd73720377114dcded411b0a09e5fe54d61 Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 12:21:05 +0800 Subject: [PATCH 4/6] Update for asking product id when ./devbox --- devbox/devbox.local/cli/devbox | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox index bc8fb33..873253e 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/devbox.local/cli/devbox @@ -94,11 +94,14 @@ devbox_init_guidance() { add_arg "--use-custom-repository" "$use_custom_repository" ;; 2) - # Ask user for product_id - read -p "Enter your product_id: " product_id + # Check if product_id is empty if [[ -z $product_id ]]; then - printf "Product ID is required.\n" - exit 1 + # Ask user for product_id + read -p "Enter your product_id: " product_id + if [[ -z $product_id ]]; then + printf "Product ID is required.\n" + exit 1 + fi fi # Ask user for Freeleaps.com username and password From 970065a2b5619de5297e31f9d34a6d2de8d25ee1 Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 12:29:18 +0800 Subject: [PATCH 5/6] Update for remove useless npm install lodash --- devbox/devbox.local/cli/devbox | 4 ---- 1 file changed, 4 deletions(-) diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox index 873253e..2a4a6c9 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/devbox.local/cli/devbox @@ -1808,10 +1808,6 @@ if [[ "${START_FRONTEND}" == "true" ]]; then echo '============================================' pushd /home/devbox/freeleaps/frontend - echo "==> Installing dependencies..." - npm install lodash - - # echo "==> Starting frontend service..." baseline_file=\$(mktemp) echo "==> Creating a baseline file for the frontend service..." From a595dba3d3f38cfc0d613768e8429212931fa4dc Mon Sep 17 00:00:00 2001 From: timqiu <9145422+cocoonwind@user.noreply.gitee.com> Date: Tue, 11 Mar 2025 16:16:41 +0800 Subject: [PATCH 6/6] Update for rename docker-compose file and cli path --- devbox/{devbox.local => }/cli/devbox | 8 +++----- .../docker-compose.yaml} | 0 .../{devbox.local => }/cli/gitea_data_backup.tar.gz | Bin 3 files changed, 3 insertions(+), 5 deletions(-) rename devbox/{devbox.local => }/cli/devbox (99%) rename devbox/{devbox.local/cli/docker-compose.dev.arm64.new.yaml => cli/docker-compose.yaml} (100%) rename devbox/{devbox.local => }/cli/gitea_data_backup.tar.gz (100%) diff --git a/devbox/devbox.local/cli/devbox b/devbox/cli/devbox similarity index 99% rename from devbox/devbox.local/cli/devbox rename to devbox/cli/devbox index 2a4a6c9..4f279eb 100644 --- a/devbox/devbox.local/cli/devbox +++ b/devbox/cli/devbox @@ -122,7 +122,7 @@ devbox_init_guidance() { exit 1 fi - printf "Repository connection successful.\n" + printf "Repository connection successfully.\n" add_arg "--use-custom-repository" "$use_custom_repository" ;; @@ -592,7 +592,6 @@ get_port() { break fi done - echo "$port" } # Build the local image @@ -1103,7 +1102,7 @@ if [[ $USE_LOCAL_COMPONENT_VAL == true ]]; then # Start Gitea, MongoDB, RabbitMQ and other components containers echo "===> start Gitea, MongoDB, RabbitMQ and other components containers" - docker-compose -f docker-compose.dev.arm64.new.yaml up -d mongodb rabbitmq gitea redis "${start_components[@]}" + docker-compose -f docker-compose.yaml up -d mongodb rabbitmq gitea redis "${start_components[@]}" gitea_container_id=$(docker ps --no-trunc -a --filter "name=^freeleaps2-gitea$" --format "{{.ID}}") echo "$gitea_container_id" > "$WORKING_HOME/.gitea-instance" @@ -1145,7 +1144,7 @@ else echo ' ===> Using online components for Freeleaps services.' echo '============================================' # Start Gitea, MongoDB, RabbitMQ containers - docker-compose -f docker-compose.dev.arm64.new.yaml up -d mongodb rabbitmq redis + docker-compose -f docker-compose.yaml up -d mongodb rabbitmq redis # Save MongoDB and RabbitMQ container ids to .mongodb-instance and .rabbitmq-instance mongo_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$") @@ -2420,7 +2419,6 @@ parse_requirements() { "") devbox_init_guidance >&2 action="init" - shift devbox_init_parse_requirements "$@" shift $# ;; diff --git a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml b/devbox/cli/docker-compose.yaml similarity index 100% rename from devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml rename to devbox/cli/docker-compose.yaml diff --git a/devbox/devbox.local/cli/gitea_data_backup.tar.gz b/devbox/cli/gitea_data_backup.tar.gz similarity index 100% rename from devbox/devbox.local/cli/gitea_data_backup.tar.gz rename to devbox/cli/gitea_data_backup.tar.gz