From 035f1c67b17eb4fbb33428e6d2da44ad7f0b5bc6 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Fri, 5 Dec 2025 15:42:25 -0800 Subject: [PATCH] fix(install): cleanup compose file names --- install/install_nomad.sh | 4 ++-- install/management_compose.yaml | 1 + install/uninstall_nomad.sh | 2 +- install/update_nomad.sh | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/install/install_nomad.sh b/install/install_nomad.sh index c933d0a..d4ef42f 100644 --- a/install/install_nomad.sh +++ b/install/install_nomad.sh @@ -227,7 +227,7 @@ create_nomad_directory(){ } download_management_compose_file() { - local compose_file_path="${NOMAD_DIR}/docker-compose-management.yml" + local compose_file_path="${NOMAD_DIR}/compose.yml" echo -e "${YELLOW}#${RESET} Downloading docker-compose file for management...\\n" if ! curl -fsSL "$MANAGEMENT_COMPOSE_FILE_URL" -o "$compose_file_path"; then @@ -289,7 +289,7 @@ download_helper_scripts() { start_management_containers() { echo -e "${YELLOW}#${RESET} Starting management containers using docker compose...\\n" - if ! sudo docker compose -f "${NOMAD_DIR}/docker-compose-management.yml" up -d; then + if ! sudo docker compose -f "${NOMAD_DIR}/compose.yml" up -d; then echo -e "${RED}#${RESET} Failed to start management containers. Please check the logs and try again." exit 1 fi diff --git a/install/management_compose.yaml b/install/management_compose.yaml index a065068..b8eac66 100644 --- a/install/management_compose.yaml +++ b/install/management_compose.yaml @@ -18,6 +18,7 @@ services: - DRIVE_DISK=fs - APP_KEY=secretlongpasswordsecret - HOST=0.0.0.0 + - URL=$HOST$PORT - DB_HOST=mysql - DB_PORT=3306 - DB_DATABASE=nomad diff --git a/install/uninstall_nomad.sh b/install/uninstall_nomad.sh index 22fb2a8..a2b959d 100644 --- a/install/uninstall_nomad.sh +++ b/install/uninstall_nomad.sh @@ -16,7 +16,7 @@ ################################################################################################################################################################################################### NOMAD_DIR="/opt/project-nomad" -MANAGEMENT_COMPOSE_FILE="${NOMAD_DIR}/docker-compose-management.yml" +MANAGEMENT_COMPOSE_FILE="${NOMAD_DIR}/compose.yml" ################################################################################################################################################################################################### # # diff --git a/install/update_nomad.sh b/install/update_nomad.sh index 75222a7..36fa74f 100644 --- a/install/update_nomad.sh +++ b/install/update_nomad.sh @@ -95,15 +95,15 @@ ensure_docker_installed_and_running() { } ensure_docker_compose_file_exists() { - if [ ! -f "/opt/project-nomad/docker-compose-management.yml" ]; then - echo -e "${RED}#${RESET} docker-compose-management.yml file not found. Please ensure it exists at /opt/project-nomad/docker-compose-management.yml." + if [ ! -f "/opt/project-nomad/compose.yml" ]; then + echo -e "${RED}#${RESET} compose.yml file not found. Please ensure it exists at /opt/project-nomad/compose.yml." exit 1 fi } force_recreate() { echo -e "${YELLOW}#${RESET} Forcing recreation of containers..." - docker-compose -f /opt/project-nomad/docker-compose-management.yml up -d --force-recreate + docker-compose -f /opt/project-nomad/compose.yml up -d --force-recreate } get_local_ip() {