diff --git a/docker-updater.sh b/docker-updater.sh index 6cc92de..77571d0 100644 --- a/docker-updater.sh +++ b/docker-updater.sh @@ -58,6 +58,10 @@ fi for folder in */; do cd $DOCKER_FOLDER/$folder + # Remove trailing slash from folder name if it exists + folder=${folder%/} + echo -e "${LIGHT_BLUE}[$folder] Checking for updates..." + # if .ignore file exists, skip the folder if [ -f ".ignore" ]; then echo -e "${LIGHT_BLUE}[$folder] Skipping docker container update" @@ -65,17 +69,13 @@ for folder in */; do continue fi - # Check if docker-compose.yml or compose.yaml exists and remove the version attribute if it exists - if [ -f "docker-compose.yml" ]; then - echo -e "${LIGHT_BLUE}[$folder] Checking docker-compose.yml for obsolete version attribute" - sed -i '/^version:/d' docker-compose.yml - elif [ -f "compose.yaml" ]; then - echo -e "${LIGHT_BLUE}[$folder] Checking compose.yaml for obsolete version attribute" - sed -i '/^version:/d' compose.yaml - elif [ -f "compose.yml" ]; then - echo -e "${LIGHT_BLUE}[$folder] Checking compose.yml for obsolete version attribute" - sed -i '/^version:/d' compose.yml - fi + # Check compose files for obsolete version attribute + for compose_file in "docker-compose.yml" "docker-compose.yaml" "compose.yaml" "compose.yml"; do + if [ -f "$compose_file" ]; then + echo -e "${LIGHT_BLUE}[$folder] Checking $compose_file for obsolete version attribute" + sed -i '/^version:/d' "$compose_file" + fi + done DOCKER_RUNNING=$(docker compose ps -q) @@ -95,7 +95,7 @@ for folder in */; do echo -e "${LIGHT_GREEN}[$folder] Updated!" - cd .. + cd $DOCKER_FOLDER done # Run Docker image prune