Compare commits

..

No commits in common. "7b45d42dafe1ab1dc47f109df98c43a0531bee0e" and "0ae0a948c2d1e66cd49bce454101123f62af6ba5" have entirely different histories.

2 changed files with 13 additions and 13 deletions

View File

@ -58,10 +58,6 @@ fi
for folder in */; do for folder in */; do
cd $DOCKER_FOLDER/$folder 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 .ignore file exists, skip the folder
if [ -f ".ignore" ]; then if [ -f ".ignore" ]; then
echo -e "${LIGHT_BLUE}[$folder] Skipping docker container update" echo -e "${LIGHT_BLUE}[$folder] Skipping docker container update"
@ -69,13 +65,17 @@ for folder in */; do
continue continue
fi fi
# Check compose files for obsolete version attribute # Check if docker-compose.yml or compose.yaml exists and remove the version attribute if it exists
for compose_file in "docker-compose.yml" "docker-compose.yaml" "compose.yaml" "compose.yml"; do if [ -f "docker-compose.yml" ]; then
if [ -f "$compose_file" ]; then echo -e "${LIGHT_BLUE}[$folder] Checking docker-compose.yml for obsolete version attribute"
echo -e "${LIGHT_BLUE}[$folder] Checking $compose_file for obsolete version attribute" sed -i '/^version:/d' docker-compose.yml
sed -i '/^version:/d' "$compose_file" elif [ -f "compose.yaml" ]; then
fi echo -e "${LIGHT_BLUE}[$folder] Checking compose.yaml for obsolete version attribute"
done 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
DOCKER_RUNNING=$(docker compose ps -q) DOCKER_RUNNING=$(docker compose ps -q)
@ -95,7 +95,7 @@ for folder in */; do
echo -e "${LIGHT_GREEN}[$folder] Updated!" echo -e "${LIGHT_GREEN}[$folder] Updated!"
cd $DOCKER_FOLDER cd ..
done done
# Run Docker image prune # Run Docker image prune

View File

@ -109,7 +109,7 @@ FILES=("clean.sh" "backup.sh" "docker-updater.sh")
# Prompt user to select files to download # Prompt user to select files to download
selected_files=() selected_files=()
echo -e "${GREY}[i] Select files to download and install on crontab:${NC} " echo -e "${GREY}[i] Select files to download and install on crontab:${NC}"
for FILE in "${FILES[@]}"; do for FILE in "${FILES[@]}"; do
read -p "Do you want to download and install $FILE? [Y/n]: " choice read -p "Do you want to download and install $FILE? [Y/n]: " choice
if [[ "$choice" == "y" || "$choice" == "Y" || -z "$choice" ]]; then if [[ "$choice" == "y" || "$choice" == "Y" || -z "$choice" ]]; then