Skip to content

Commit 067bb81

Browse files
authored
πŸ› fix and clean deploy.sh
2 parents db718c1 + d75d446 commit 067bb81

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

β€Ždocker/deploy.shβ€Ž

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ main_deploy() {
649649

650650
# Select deployment mode and checks
651651
select_deployment_mode || { echo "❌ Deployment mode selection failed"; exit 1; }
652-
select_terminal_tool || { echo "❌ Terminal tool configuration failed"; exit 1; }
652+
select_terminal_tool || { echo "❌ Terminal tool configuration failed"; exit 1; }
653653

654654
# Choose image environment before generating keys that need Docker images
655655
if [ "$DEPLOYMENT_MODE" = "beta" ]; then
@@ -686,13 +686,7 @@ main_deploy() {
686686
INFRA_SERVICES="$INFRA_SERVICES nexent-openssh-server"
687687
echo "πŸ”§ Terminal tool enabled - openssh-server will be included in infrastructure"
688688
fi
689-
690-
# Set profiles for docker-compose if any are defined
691-
if [ -n "$COMPOSE_PROFILES" ]; then
692-
export COMPOSE_PROFILES
693-
echo "πŸ“‹ Using profiles: $COMPOSE_PROFILES"
694-
fi
695-
689+
696690
if ! docker-compose -p nexent -f "${COMPOSE_FILE}" up -d $INFRA_SERVICES; then
697691
echo "❌ ERROR Failed to start infrastructure services"
698692
exit 1
@@ -711,23 +705,6 @@ main_deploy() {
711705
echo "πŸ’‘ Use 'source .env' to load environment variables in your development shell"
712706
return 0
713707
fi
714-
715-
# Normal deployment flow for other modes
716-
select_terminal_tool || { echo "❌ Terminal tool configuration failed"; exit 1; }
717-
add_permission || { echo "❌ Permission setup failed"; exit 1; }
718-
719-
# Choose image environment before generating keys that need Docker images
720-
if [ "$DEPLOYMENT_MODE" = "beta" ]; then
721-
choose_beta_env || { echo "❌ Beta environment setup failed"; exit 1; }
722-
else
723-
choose_image_env || { echo "❌ Image environment setup failed"; exit 1; }
724-
fi
725-
726-
# Pull required images before using them
727-
pull_required_images || { echo "❌ Required image pull failed"; exit 1; }
728-
729-
# Generate SSH keys for terminal tool (only needed if terminal tool is enabled)
730-
generate_ssh_keys || { echo "❌ SSH key generation failed"; exit 1; }
731708

732709
# Install services and generate environment
733710
install || { echo "❌ Service installation failed"; exit 1; }

0 commit comments

Comments
Β (0)