forked from freeleaps/freeleaps-pub
Update for adding logic to exit deinit when devbox container cannot stop and remove
This commit is contained in:
parent
f6304db2aa
commit
9f32656c5c
@ -690,7 +690,7 @@ EOFinner
|
|||||||
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://chat:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://chat:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://chat:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://chat:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
|
|
||||||
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
|
||||||
else
|
else
|
||||||
# Online component environment variables
|
# Online component environment variables
|
||||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
||||||
@ -724,8 +724,6 @@ EOFinner
|
|||||||
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"
|
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"
|
||||||
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_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_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
|
|
||||||
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
|
||||||
|
|
||||||
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set."
|
echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set."
|
||||||
fi
|
fi
|
||||||
@ -738,6 +736,8 @@ if true ; then
|
|||||||
|
|
||||||
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
|
|
||||||
|
popd > /dev/null
|
||||||
|
|
||||||
# Load the environment variables
|
# Load the environment variables
|
||||||
source /home/devbox/freeleaps/apps/.env
|
source /home/devbox/freeleaps/apps/.env
|
||||||
|
|
||||||
@ -1203,15 +1203,16 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
|
|||||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
|
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
|
||||||
sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012#VITE_PROXY_WEBSOCKET_CHAT_URL=ws://chat:8012#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012#VITE_PROXY_WEBSOCKET_CHAT_URL=ws://chat:8012#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=http://chat:8012#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=http://chat:8012#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
|
||||||
else
|
else
|
||||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
|
||||||
sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=wss://localhost:8012#VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=wss://localhost:8012#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=http://localhost:8012#VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
|
|
||||||
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
pushd /home/devbox/freeleaps > /dev/null
|
||||||
|
git update-index --skip-worktree /home/devbox/freeleaps/frontend/freeleaps/.env.development
|
||||||
|
popd > /dev/null
|
||||||
|
|
||||||
if [[ ! -d "node_modules" || "package.json" -nt "node_modules" || \$time_diff -gt \$threshold ]]; then
|
if [[ ! -d "node_modules" || "package.json" -nt "node_modules" || \$time_diff -gt \$threshold ]]; then
|
||||||
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Installing/Updating frontend dependencies..."
|
echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Installing/Updating frontend dependencies..."
|
||||||
|
|
||||||
@ -2218,6 +2219,16 @@ devbox_deinit_command() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check if devbox container is running
|
||||||
|
if [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^devbox\$")" ]]; then
|
||||||
|
# Get the container ID of the DevBox container
|
||||||
|
log_info "DevBox container is stopped."
|
||||||
|
local container_id
|
||||||
|
container_id=$(docker ps -a --format '{{.Names}}' | grep "^devbox\$")
|
||||||
|
|
||||||
|
exit_with_message " Failed to stop and remove DevBox container when deinitializing. Please try deinit again or manually stop and remove the container." 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -f "$WORKING_HOME/.gitea-instance" ]]; then
|
if [[ -f "$WORKING_HOME/.gitea-instance" ]]; then
|
||||||
local gitea_container_id
|
local gitea_container_id
|
||||||
gitea_container_id=$(cat "$WORKING_HOME/.gitea-instance")
|
gitea_container_id=$(cat "$WORKING_HOME/.gitea-instance")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user