From 9b9a536697bf679983cf214c911c6a1400fb8400 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 3 May 2025 20:18:09 +1200 Subject: [PATCH] Tidying --- templates/example-nginx/_common.sh | 27 ----------------------- templates/watchtower/_common.sh | 35 +++++++----------------------- 2 files changed, 8 insertions(+), 54 deletions(-) diff --git a/templates/example-nginx/_common.sh b/templates/example-nginx/_common.sh index 8c9d4e1..d89d737 100755 --- a/templates/example-nginx/_common.sh +++ b/templates/example-nginx/_common.sh @@ -47,18 +47,6 @@ create_and_start_container() { echo "Container ${container_name} is running with ID ${ID}" } -function create_folder() { - local folder="$1" - if [ -d "$folder" ]; then - return 0 - fi - if ! mkdir -p "$folder"; then - die "Failed to create folder: $folder" - fi - chmod 777 "$folder" - echo "Folder created: $folder" -} - # Check if docker is installed _check_docker_installed() { if ! command -v docker &> /dev/null; then @@ -102,11 +90,6 @@ _get_container_id() { docker ps --format "{{.ID}}" --filter "name=$1" } -# get container status -_get_container_status() { - docker ps --format "{{.Status}}" --filter "name=$1" -} - # start container that exists _start_container() { _is_container_exists $1 || return 1 @@ -127,16 +110,6 @@ _remove_container() { docker rm $1 } -# get container logs -_get_container_logs() { - if ! _is_container_exists $1; then - echo "Container $1 does not exist" - return 1 - fi - - docker logs $1 -} - check_required_env_vars() { local required_vars=("$@") for var in "${required_vars[@]}"; do diff --git a/templates/watchtower/_common.sh b/templates/watchtower/_common.sh index ec4aca2..d89d737 100755 --- a/templates/watchtower/_common.sh +++ b/templates/watchtower/_common.sh @@ -47,18 +47,6 @@ create_and_start_container() { echo "Container ${container_name} is running with ID ${ID}" } -function create_folder() { - local folder="$1" - if [ -d "$folder" ]; then - return 0 - fi - if ! mkdir -p "$folder"; then - die "Failed to create folder: $folder" - fi - chmod 777 "$folder" - echo "Folder created: $folder" -} - # Check if docker is installed _check_docker_installed() { if ! command -v docker &> /dev/null; then @@ -102,11 +90,6 @@ _get_container_id() { docker ps --format "{{.ID}}" --filter "name=$1" } -# get container status -_get_container_status() { - docker ps --format "{{.Status}}" --filter "name=$1" -} - # start container that exists _start_container() { _is_container_exists $1 || return 1 @@ -127,16 +110,6 @@ _remove_container() { docker rm $1 } -# get container logs -_get_container_logs() { - if ! _is_container_exists $1; then - echo "Container $1 does not exist" - return 1 - fi - - docker logs $1 -} - check_required_env_vars() { local required_vars=("$@") for var in "${required_vars[@]}"; do @@ -145,3 +118,11 @@ check_required_env_vars() { fi done } + +function _root_remove_tree() { + local to_remove="$1" + parent=$(dirname "$to_remove") + abs_parent=$(realpath "$parent") + child=$(basename "$to_remove") + docker run --rm -v "$abs_parent":/data alpine rm -rf "/data/$child" +}