From 7d110bee8ee9ea4b8da23846bf0443c3ce62929b Mon Sep 17 00:00:00 2001 From: gibbyb Date: Mon, 8 Sep 2025 15:03:50 -0500 Subject: [PATCH] okay now we good --- host/convex/update | 13 +++++++------ host/next/docker/compose.yml | 4 ++-- host/next/update | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/host/convex/update b/host/convex/update index 041c4ab..f4b2899 100755 --- a/host/convex/update +++ b/host/convex/update @@ -1,11 +1,12 @@ #!/usr/bin/env bash set -e # Exit immediately if a command exits with a non-zero status. +# --- Configuration --- COMPOSE_FILE="./host/convex/docker/compose.yml" +DEFAULT_PROJECT_NAME="techtracker" DEV_PROJECT_NAME="dev-techtracker" # The project name for dev mode -# --- Variables --- -COMPOSE_PROJECT_FLAG="" # This will hold "-p dev-techtracker" if --dev is used +COMPOSE_PROJECT_FLAG=${DEFAULT_PROJECT_NAME} # This will hold "-p dev-techtracker" if --dev is used # --- Function to display usage --- usage() { @@ -23,7 +24,7 @@ usage() { while [[ "$#" -gt 0 ]]; do case "$1" in -d|--dev) - COMPOSE_PROJECT_FLAG="-p ${DEV_PROJECT_NAME}" + COMPOSE_PROJECT_FLAG=${DEV_PROJECT_NAME} shift # Consume the argument ;; -h|--help) @@ -40,9 +41,9 @@ done echo "--- Pulling latest git changes ---" git pull echo "--- Building Docker Compose services ${COMPOSE_PROJECT_FLAG} ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" build +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" build echo "--- Bringing down Docker Compose services ${COMPOSE_PROJECT_FLAG} ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" down +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" down echo "--- Bringing up Docker Compose services ${COMPOSE_PROJECT_FLAG} in detached mode ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" up -d +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" up -d echo "--- Script finished successfully ---" diff --git a/host/next/docker/compose.yml b/host/next/docker/compose.yml index 05e4755..2c9a60a 100644 --- a/host/next/docker/compose.yml +++ b/host/next/docker/compose.yml @@ -1,5 +1,5 @@ networks: - ${NETWORK}: + nginx-bridge: # You need to change this line to your defined network is as well external: true services: techtracker-next: @@ -11,7 +11,7 @@ services: env_file: [.env] hostname: ${CONTAINER_NAME} domainname: ${DOMAIN_NAME} - networks: ['${NETWORK}'] + networks: ['${NETWORK:-nginx-bridge}'] #ports: ['${PORT}:3000'] tty: true stdin_open: true diff --git a/host/next/update b/host/next/update index 9ef5e70..f18be1e 100755 --- a/host/next/update +++ b/host/next/update @@ -3,10 +3,10 @@ set -e # Exit immediately if a command exits with a non-zero status. # --- Configuration --- COMPOSE_FILE="./host/next/docker/compose.yml" +DEFAULT_PROJECT_NAME="techtracker" DEV_PROJECT_NAME="dev-techtracker" # The project name for dev mode -# --- Variables --- -COMPOSE_PROJECT_FLAG="" # This will hold "-p dev-techtracker" if --dev is used +COMPOSE_PROJECT_FLAG=${DEFAULT_PROJECT_NAME} # This will hold "-p dev-techtracker" if --dev is used # --- Function to display usage --- usage() { @@ -24,7 +24,7 @@ usage() { while [[ "$#" -gt 0 ]]; do case "$1" in -d|--dev) - COMPOSE_PROJECT_FLAG="-p ${DEV_PROJECT_NAME}" + COMPOSE_PROJECT_FLAG=${DEV_PROJECT_NAME} shift # Consume the argument ;; -h|--help) @@ -41,9 +41,9 @@ done echo "--- Pulling latest git changes ---" git pull echo "--- Building Docker Compose services ${COMPOSE_PROJECT_FLAG} ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" build +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" build echo "--- Bringing down Docker Compose services ${COMPOSE_PROJECT_FLAG} ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" down +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" down echo "--- Bringing up Docker Compose services ${COMPOSE_PROJECT_FLAG} in detached mode ---" -sudo docker compose ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" up -d +sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" up -d echo "--- Script finished successfully ---"