forked from freeleaps/freeleaps-pub
Merged PR 57: Update for solve frontend .env for alpha and local switch
Update for solve frontend .env for alpha and local switch
This commit is contained in:
commit
accc7eeece
@ -686,15 +686,12 @@ if [[ "$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
|
||||
EOFinner
|
||||
|
||||
|
||||
cat << 'EOFFRONTEND_DEVELOPMENT' > /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
export VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012
|
||||
export VITE_PROXY_API_CHAT_URL=http://localhost:8012
|
||||
EOFFRONTEND_DEVELOPMENT
|
||||
|
||||
cat << 'EOFFRONTEND_DEV' > /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
export VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012
|
||||
export VITE_PROXY_API_CHAT_URL=http://localhost:8012
|
||||
EOFFRONTEND_DEV
|
||||
# Update set VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development and frontend/.env.dev
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
else
|
||||
# Online component environment variables
|
||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
||||
@ -724,16 +721,18 @@ else
|
||||
export VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com
|
||||
export VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com
|
||||
EOFinner
|
||||
# Update set VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development and frontend/.env.dev
|
||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Update VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development and frontend/.env.dev"
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
|
||||
cat << 'EOFFRONTEND_DEVELOPMENT' > /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
export VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com
|
||||
export VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com
|
||||
EOFFRONTEND_DEVELOPMENT
|
||||
|
||||
cat << 'EOFFRONTEND_DEV' > /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
export VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com
|
||||
export VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com
|
||||
EOFFRONTEND_DEV
|
||||
tail -n 20 /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
tail -n 20 /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
|
||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set."
|
||||
fi
|
||||
|
||||
if true ; then
|
||||
@ -830,9 +829,6 @@ if true ; then
|
||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Git status check completed."
|
||||
echo
|
||||
|
||||
|
||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Backend and frontend environment initialization completed."
|
||||
|
||||
fi
|
||||
EOF
|
||||
|
||||
@ -1179,11 +1175,16 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
USE_LOCAL_COMPONENT_FLAG="/home/devbox/.use-local-component"
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
|
||||
USE_LOCAL_COMPONENT_VAL="false"
|
||||
if [ -f "\$USE_LOCAL_COMPONENT_FLAG" ]; then
|
||||
# Read the value from the file
|
||||
USE_LOCAL_COMPONENT_VAL=\$(cat "\$USE_LOCAL_COMPONENT_FLAG")
|
||||
fi
|
||||
|
||||
pushd /home/devbox/freeleaps/frontend > /dev/null
|
||||
source /home/devbox/freeleaps/apps/.env
|
||||
|
||||
# Record the git status baseline before compilation
|
||||
baseline_frontend=\$(mktemp)
|
||||
@ -1207,6 +1208,32 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
|
||||
# Set the threshold for the time difference
|
||||
threshold=150
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') USE_LOCAL_COMPONENT_VAL: \$USE_LOCAL_COMPONENT_VAL"
|
||||
if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
else
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||
|
||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev
|
||||
fi
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Check frontend environment variables...from /home/devbox/freeleaps/frontend/freeleaps/.env.development"
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') \$(tail -n 30 /home/devbox/freeleaps/frontend/freeleaps/.env.development)"
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Check frontend environment variables...from /home/devbox/freeleaps/frontend/freeleaps/.env.dev"
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') \$(tail -n 30 /home/devbox/freeleaps/frontend/freeleaps/.env.dev)"
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
|
||||
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking frontend dependencies..."
|
||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Time difference: \$time_diff seconds, lock_time: \$lock_time, modules_time: \$modules_time"
|
||||
|
||||
@ -2075,6 +2102,7 @@ init_compile_env
|
||||
if [[ "$user_input" == "N" || "$user_input" == "n" ]]; then
|
||||
|
||||
# Echo as init job completed and exit
|
||||
reset_freeleaps_repo
|
||||
echo
|
||||
echo "==========================================================="
|
||||
log_info "DevBox init completed successfully!"
|
||||
@ -2179,6 +2207,16 @@ devbox_deinit_command() {
|
||||
fi
|
||||
|
||||
rm -f "$WORKING_HOME/.gitea-instance"
|
||||
|
||||
elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-gitea\$")" ]]; then
|
||||
# If the Gitea container is still running, stop and remove it
|
||||
log_info "Gitea container is stopped."
|
||||
local gitea_container_id
|
||||
gitea_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-gitea\$")
|
||||
|
||||
log_info "Stopping and removing Gitea container: $gitea_container_id"
|
||||
docker stop "$gitea_container_id" &>/dev/null || true
|
||||
docker rm "$gitea_container_id" &>/dev/null || true
|
||||
fi
|
||||
|
||||
# Stop and remove MongoDB container
|
||||
@ -2196,6 +2234,16 @@ devbox_deinit_command() {
|
||||
fi
|
||||
|
||||
rm -f "$WORKING_HOME/.mongodb-instance"
|
||||
|
||||
elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$")" ]]; then
|
||||
# If the MongoDB container is still running, stop and remove it
|
||||
log_info "MongoDB container is stopped."
|
||||
local mongodb_container_id
|
||||
mongodb_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$")
|
||||
|
||||
log_info "Stopping and removing MongoDB container: $mongodb_container_id"
|
||||
docker stop "$mongodb_container_id" &>/dev/null || true
|
||||
docker rm "$mongodb_container_id" &>/dev/null || true
|
||||
fi
|
||||
|
||||
if [[ -f "$WORKING_HOME/.redis-instance" ]]; then
|
||||
@ -2212,6 +2260,16 @@ devbox_deinit_command() {
|
||||
fi
|
||||
|
||||
rm -f "$WORKING_HOME/.redis-instance"
|
||||
elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-redis\$")" ]]; then
|
||||
# If the Redis container is still running, stop and remove it
|
||||
log_info "Redis container is stopped."
|
||||
local redis_container_id
|
||||
redis_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-redis\$")
|
||||
|
||||
log_info "Stopping and removing Redis container: $redis_container_id"
|
||||
docker stop "$redis_container_id" &>/dev/null || true
|
||||
docker rm "$redis_container_id" &>/dev/null || true
|
||||
|
||||
fi
|
||||
|
||||
# Stop and remove RabbitMQ container
|
||||
@ -2229,6 +2287,15 @@ devbox_deinit_command() {
|
||||
fi
|
||||
|
||||
rm -f "$WORKING_HOME/.rabbitmq-instance"
|
||||
elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-rabbitmq\$")" ]]; then
|
||||
# If the RabbitMQ container is still running, stop and remove it
|
||||
log_info "RabbitMQ container is stopped."
|
||||
local rabbitmq_container_id
|
||||
rabbitmq_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-rabbitmq\$")
|
||||
|
||||
log_info "Stopping and removing RabbitMQ container: $rabbitmq_container_id"
|
||||
docker stop "$rabbitmq_container_id" &>/dev/null || true
|
||||
docker rm "$rabbitmq_container_id" &>/dev/null || true
|
||||
fi
|
||||
|
||||
# Stop and remove other components
|
||||
@ -2248,6 +2315,15 @@ devbox_deinit_command() {
|
||||
fi
|
||||
|
||||
rm -f "$WORKING_HOME/.${component}-instance"
|
||||
elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^$component\$")" ]]; then
|
||||
# If the component is still running, stop and remove it
|
||||
log_info "${component} container is stopped."
|
||||
local component_container_id
|
||||
component_container_id=$(docker ps -a --format '{{.Names}}' | grep "^$component\$")
|
||||
|
||||
log_info "Stopping and removing ${component} container: $component_container_id"
|
||||
docker stop "$component_container_id" &>/dev/null || true
|
||||
docker rm "$component_container_id" &>/dev/null || true
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user