diff --git a/lib/functions.sh b/lib/functions.sh index ee8b4c5..f801962 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -383,23 +383,12 @@ start_service() { fi fi - # On first startup, the containers are being downloaded -- this may fail - # with timeouts, so allow trying again - local TRIES=0 if [ $DEBUG ]; then # Start /federated/apps/SERVICE with output to console for debug - while [ "$TRIES" -lt 100 ]; do - docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up && break - sleep 5s - TRIES=$((TRIES+1)) - done + docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE" else - while [ "$TRIES" -lt 100 ]; do - docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null && break - sleep 5s - TRIES=$((TRIES+1)) - done + docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &>/dev/null # Keep trying service port to make sure it's up before # we proceed @@ -1469,8 +1458,9 @@ EOF dnf -y --refresh install docker docker-compose #wget https://file-store.openmandriva.org/api/v1/file_stores/142e76f40a398c59aaafa727bdf889fb1511d715 #sudo rpm -Uvh --oldpackage docker-27.5.0* - # Put in log rotation fix for docker container logs sed -i -e "s,^OPTIONS=.*,OPTIONS=''," /etc/sysconfig/docker + echo 'DOCKER_STORAGE_OPTIONS = --storage-driver btrfs' >>/etc/sysconfig/docker-storage + # Put in log rotation fix for docker container logs cat > /etc/docker/daemon.json <