diff --git a/graylog-client/install.sh b/graylog-client/install.sh index 1c0d52d..2d0c225 100755 --- a/graylog-client/install.sh +++ b/graylog-client/install.sh @@ -27,7 +27,7 @@ bash "$SCRIPT_DIR/scripts/generate-config.sh" || _die "Failed to generate config # Start the client echo "Starting Graylog Client..." cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose up -d || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start" echo "" echo "=========================================" diff --git a/graylog-client/start.sh b/graylog-client/start.sh index 9981cda..8f0b345 100755 --- a/graylog-client/start.sh +++ b/graylog-client/start.sh @@ -5,6 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose up -d || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start" echo "Graylog client started" diff --git a/graylog-client/stop.sh b/graylog-client/stop.sh index 82d3673..167c616 100755 --- a/graylog-client/stop.sh +++ b/graylog-client/stop.sh @@ -5,6 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose down || true +docker compose -p "${CONTAINER_NAME}" down || true echo "Graylog client stopped" diff --git a/graylog-client/uninstall.sh b/graylog-client/uninstall.sh index f767300..39014f5 100755 --- a/graylog-client/uninstall.sh +++ b/graylog-client/uninstall.sh @@ -7,7 +7,7 @@ _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers -docker compose down || true +docker compose -p "${CONTAINER_NAME}" down || true # Remove the container if it still exists _remove_container "$CONTAINER_NAME" 2>/dev/null || true diff --git a/logclient/install.sh b/logclient/install.sh index 62efcce..0fcc92e 100755 --- a/logclient/install.sh +++ b/logclient/install.sh @@ -22,7 +22,7 @@ bash "$SCRIPT_DIR/scripts/generate-config.sh" || _die "Failed to generate config # Start the client echo "Starting Log Client..." -docker compose up -d --build || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d --build || _die "Failed to start" echo "" echo "=========================================" diff --git a/logclient/start.sh b/logclient/start.sh index 690dbeb..9208eaa 100755 --- a/logclient/start.sh +++ b/logclient/start.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose up -d --build || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d --build || _die "Failed to start" echo "Log Client started" \ No newline at end of file diff --git a/logclient/stop.sh b/logclient/stop.sh index 798f35f..1fe2ff8 100755 --- a/logclient/stop.sh +++ b/logclient/stop.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose stop || _die "Failed to stop" +docker compose -p "${CONTAINER_NAME}" stop || _die "Failed to stop" echo "Log Client stopped" \ No newline at end of file diff --git a/logclient/uninstall.sh b/logclient/uninstall.sh index 2e60077..667248e 100755 --- a/logclient/uninstall.sh +++ b/logclient/uninstall.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose down || true +docker compose -p "${CONTAINER_NAME}" down || true echo "Log Client uninstalled" \ No newline at end of file diff --git a/logserver/install.sh b/logserver/install.sh index a3248cb..27055db 100755 --- a/logserver/install.sh +++ b/logserver/install.sh @@ -36,7 +36,7 @@ fi # Start the stack echo "Starting Log Server..." -docker compose up -d --build || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d --build || _die "Failed to start" # Wait for services echo -n "Waiting for services to start..." diff --git a/logserver/logs.sh b/logserver/logs.sh index 9dcd348..0de807c 100755 --- a/logserver/logs.sh +++ b/logserver/logs.sh @@ -4,4 +4,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose logs "$@" +docker compose -p "${CONTAINER_NAME}" logs "$@" diff --git a/logserver/start.sh b/logserver/start.sh index 5dc9cd5..026738d 100755 --- a/logserver/start.sh +++ b/logserver/start.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose up -d --build || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d --build || _die "Failed to start" echo "Log Server started" \ No newline at end of file diff --git a/logserver/stop.sh b/logserver/stop.sh index b9d081d..0378e2e 100755 --- a/logserver/stop.sh +++ b/logserver/stop.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose stop || _die "Failed to stop" +docker compose -p "${CONTAINER_NAME}" stop || _die "Failed to stop" echo "Log Server stopped" \ No newline at end of file diff --git a/logserver/uninstall.sh b/logserver/uninstall.sh index 3868521..7cf53cf 100755 --- a/logserver/uninstall.sh +++ b/logserver/uninstall.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose down || true +docker compose -p "${CONTAINER_NAME}" down || true echo "Log Server uninstalled (data preserved)" \ No newline at end of file diff --git a/shlink/backup.sh b/shlink/backup.sh index 5e6cc5e..9828b25 100755 --- a/shlink/backup.sh +++ b/shlink/backup.sh @@ -17,7 +17,7 @@ echo "Dumping MariaDB database..." docker exec ${CONTAINER_NAME}_db mariadb-dump -u "$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" > "${DATA_PATH}/database.sql" || _die "Failed to dump database" # Stop containers for consistent backup -docker compose stop +docker compose -p "${CONTAINER_NAME}" stop # Backup using dropshell's backup system # shellcheck disable=SC2046 @@ -27,6 +27,6 @@ backup_items $(get_shlink_volumes) || _die "Failed to create backup" rm -f "${DATA_PATH}/database.sql" # Restart containers -docker compose start +docker compose -p "${CONTAINER_NAME}" start echo "Backup created successfully" diff --git a/shlink/destroy.sh b/shlink/destroy.sh index 7ed6d76..19f67f2 100755 --- a/shlink/destroy.sh +++ b/shlink/destroy.sh @@ -13,7 +13,7 @@ export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IM cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers -docker compose down +docker compose -p "${CONTAINER_NAME}" down # Destroy data # shellcheck disable=SC2046 diff --git a/shlink/install.sh b/shlink/install.sh index bd633c5..0a3e2d8 100755 --- a/shlink/install.sh +++ b/shlink/install.sh @@ -16,13 +16,13 @@ export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IM cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Pull images -docker compose pull || _die "Failed to pull images" +docker compose -p "${CONTAINER_NAME}" pull || _die "Failed to pull images" # Stop existing containers -docker compose down 2>/dev/null || true +docker compose -p "${CONTAINER_NAME}" down 2>/dev/null || true # Start containers -docker compose up -d || _die "Failed to start containers" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start containers" echo "Installation of ${CONTAINER_NAME} complete" echo "Access Shlink at http://localhost:${HTTP_PORT}" diff --git a/shlink/logs.sh b/shlink/logs.sh index 9dcd348..0de807c 100755 --- a/shlink/logs.sh +++ b/shlink/logs.sh @@ -4,4 +4,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose logs "$@" +docker compose -p "${CONTAINER_NAME}" logs "$@" diff --git a/shlink/restore.sh b/shlink/restore.sh index d32b450..8d8f6e9 100755 --- a/shlink/restore.sh +++ b/shlink/restore.sh @@ -13,14 +13,14 @@ export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IM cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers before restore -docker compose down +docker compose -p "${CONTAINER_NAME}" down # Restore files using dropshell's restore system # shellcheck disable=SC2046 restore_items $(get_shlink_volumes) || _die "Failed to restore data from backup file" # Start database container only -docker compose up -d db +docker compose -p "${CONTAINER_NAME}" up -d db echo "Waiting for database to be ready..." sleep 10 @@ -39,6 +39,6 @@ else fi # Start all containers -docker compose up -d +docker compose -p "${CONTAINER_NAME}" up -d echo "Restore complete! Service is running." diff --git a/shlink/start.sh b/shlink/start.sh index 2d8243b..cfeaed5 100755 --- a/shlink/start.sh +++ b/shlink/start.sh @@ -9,6 +9,6 @@ export DB_NAME DB_USER DB_PASSWORD DB_ROOT_PASSWORD export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IMAGE_TAG cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose up -d || _die "Failed to start containers" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start containers" echo "Container ${CONTAINER_NAME} started" diff --git a/shlink/stop.sh b/shlink/stop.sh index 48ce9a1..1c7a332 100755 --- a/shlink/stop.sh +++ b/shlink/stop.sh @@ -9,6 +9,6 @@ export DB_NAME DB_USER DB_PASSWORD DB_ROOT_PASSWORD export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IMAGE_TAG cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose stop || _die "Failed to stop containers" +docker compose -p "${CONTAINER_NAME}" stop || _die "Failed to stop containers" echo "Container ${CONTAINER_NAME} stopped" diff --git a/shlink/uninstall.sh b/shlink/uninstall.sh index 79ebed6..8fe7506 100755 --- a/shlink/uninstall.sh +++ b/shlink/uninstall.sh @@ -11,6 +11,6 @@ export IMAGE_REGISTRY IMAGE_REPO IMAGE_TAG DB_IMAGE_REGISTRY DB_IMAGE_REPO DB_IM cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers (but preserve data) -docker compose down || _die "Failed to stop containers" +docker compose -p "${CONTAINER_NAME}" down || _die "Failed to stop containers" echo "Uninstalled ${CONTAINER_NAME} (data preserved in ${DATA_PATH})" diff --git a/simple-logs/install.sh b/simple-logs/install.sh index 0e35ab3..2b34c52 100755 --- a/simple-logs/install.sh +++ b/simple-logs/install.sh @@ -20,7 +20,7 @@ cp "$SCRIPT_DIR/config/dashboards/"*.json "${CONFIG_PATH}/dashboards/" 2>/dev/nu # Start the stack echo "Starting Simple Logs stack..." -docker compose up -d || _die "Failed to start" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start" # Wait for Grafana to be ready echo -n "Waiting for Grafana to start..." diff --git a/simple-logs/logs.sh b/simple-logs/logs.sh index 9dcd348..0de807c 100755 --- a/simple-logs/logs.sh +++ b/simple-logs/logs.sh @@ -4,4 +4,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" _check_required_env_vars "CONTAINER_NAME" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose logs "$@" +docker compose -p "${CONTAINER_NAME}" logs "$@" diff --git a/simple-logs/start.sh b/simple-logs/start.sh index 12c40b2..8955cfd 100755 --- a/simple-logs/start.sh +++ b/simple-logs/start.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose up -d || _die "Failed to start Simple Logs" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start Simple Logs" echo "Simple Logs started" \ No newline at end of file diff --git a/simple-logs/stop.sh b/simple-logs/stop.sh index 8b30519..c026076 100755 --- a/simple-logs/stop.sh +++ b/simple-logs/stop.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose stop || _die "Failed to stop Simple Logs" +docker compose -p "${CONTAINER_NAME}" stop || _die "Failed to stop Simple Logs" echo "Simple Logs stopped" \ No newline at end of file diff --git a/simple-logs/uninstall.sh b/simple-logs/uninstall.sh index ab01fe8..0a6bc96 100755 --- a/simple-logs/uninstall.sh +++ b/simple-logs/uninstall.sh @@ -2,5 +2,5 @@ source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" -docker compose down || true +docker compose -p "${CONTAINER_NAME}" down || true echo "Simple Logs uninstalled (data preserved)" \ No newline at end of file diff --git a/wikijs/backup.sh b/wikijs/backup.sh index ec62bea..a120722 100755 --- a/wikijs/backup.sh +++ b/wikijs/backup.sh @@ -15,7 +15,7 @@ echo "Dumping PostgreSQL database..." docker exec ${CONTAINER_NAME}_db pg_dump -U "$DB_USER" "$DB_NAME" > "${DATA_PATH}/database.sql" || _die "Failed to dump database" # Stop containers for consistent backup -docker compose stop +docker compose -p "${CONTAINER_NAME}" stop # Backup using dropshell's backup system # shellcheck disable=SC2046 @@ -25,6 +25,6 @@ backup_items $(get_wikijs_volumes) || _die "Failed to create backup" rm -f "${DATA_PATH}/database.sql" # Restart containers -docker compose start +docker compose -p "${CONTAINER_NAME}" start echo "Backup created successfully" diff --git a/wikijs/destroy.sh b/wikijs/destroy.sh index 17b8c88..1ef21b2 100755 --- a/wikijs/destroy.sh +++ b/wikijs/destroy.sh @@ -12,7 +12,7 @@ echo "This includes all wiki pages, users, database, and configuration!" cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers -docker compose down -v 2>/dev/null || true +docker compose -p "${CONTAINER_NAME}" down -v 2>/dev/null || true # Remove data directory rm -rf "${DATA_PATH}" diff --git a/wikijs/install.sh b/wikijs/install.sh index b1932e5..d858edb 100755 --- a/wikijs/install.sh +++ b/wikijs/install.sh @@ -30,13 +30,13 @@ export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Pull images -docker compose pull || _die "Failed to pull images" +docker compose -p "${CONTAINER_NAME}" pull || _die "Failed to pull images" # Stop existing containers -docker compose down 2>/dev/null || true +docker compose -p "${CONTAINER_NAME}" down 2>/dev/null || true # Start containers (--build ensures fresh state) -docker compose up -d --build || _die "Failed to start containers" +docker compose -p "${CONTAINER_NAME}" up -d --build || _die "Failed to start containers" echo "Installation of ${CONTAINER_NAME} complete" echo "Access Wiki.js at http://localhost:${HTTP_PORT}" diff --git a/wikijs/logs.sh b/wikijs/logs.sh index 34c98b9..1c71b59 100755 --- a/wikijs/logs.sh +++ b/wikijs/logs.sh @@ -10,5 +10,5 @@ cd "$SCRIPT_DIR" || _die "Failed to change to script directory" echo "Container ${CONTAINER_NAME} logs:" _grey_start -docker compose logs "$@" +docker compose -p "${CONTAINER_NAME}" logs "$@" _grey_end diff --git a/wikijs/restore.sh b/wikijs/restore.sh index 01a487b..45860dc 100755 --- a/wikijs/restore.sh +++ b/wikijs/restore.sh @@ -11,14 +11,14 @@ export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers before restore -docker compose down +docker compose -p "${CONTAINER_NAME}" down # Restore files using dropshell's restore system # shellcheck disable=SC2046 restore_items $(get_wikijs_volumes) || _die "Failed to restore data from backup file" # Start database container only -docker compose up -d db +docker compose -p "${CONTAINER_NAME}" up -d db echo "Waiting for database to be ready..." sleep 5 @@ -38,6 +38,6 @@ else fi # Start all containers -docker compose up -d +docker compose -p "${CONTAINER_NAME}" up -d echo "Restore complete! Service is running." diff --git a/wikijs/start.sh b/wikijs/start.sh index 6f4a465..a2da9df 100755 --- a/wikijs/start.sh +++ b/wikijs/start.sh @@ -7,7 +7,7 @@ _check_required_env_vars "CONTAINER_NAME" "DATA_PATH" export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose up -d || _die "Failed to start containers" +docker compose -p "${CONTAINER_NAME}" up -d || _die "Failed to start containers" echo "Container ${CONTAINER_NAME} started" echo "Access Wiki.js at http://localhost:${HTTP_PORT}" diff --git a/wikijs/stop.sh b/wikijs/stop.sh index 99bf768..b3323af 100755 --- a/wikijs/stop.sh +++ b/wikijs/stop.sh @@ -7,6 +7,6 @@ _check_required_env_vars "CONTAINER_NAME" export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER DB_PASS cd "$SCRIPT_DIR" || _die "Failed to change to script directory" -docker compose stop || _die "Failed to stop containers" +docker compose -p "${CONTAINER_NAME}" stop || _die "Failed to stop containers" echo "Container ${CONTAINER_NAME} stopped" diff --git a/wikijs/uninstall.sh b/wikijs/uninstall.sh index df38f21..beb3fbb 100755 --- a/wikijs/uninstall.sh +++ b/wikijs/uninstall.sh @@ -9,10 +9,10 @@ export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER cd "$SCRIPT_DIR" || _die "Failed to change to script directory" # Stop and remove containers (but preserve volumes/data) -docker compose down || _die "Failed to stop containers" +docker compose -p "${CONTAINER_NAME}" down || _die "Failed to stop containers" # Remove images -docker compose config --images | xargs -r docker rmi 2>/dev/null || true +docker compose -p "${CONTAINER_NAME}" config --images | xargs -r docker rmi 2>/dev/null || true echo "Uninstallation of ${CONTAINER_NAME} complete." echo "Data preserved in ${DATA_PATH}. To remove all data, use destroy.sh"