bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Tweak docker config; remove workaround for download failures [not needed with new docker configs]

Browse Source
This commit is contained in:
Bernhard Rosenkränzer 2025-02-20 23:10:37 +01:00
parent ae86f52fa2
commit 76d405c0a4
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/functions.sh
View File

@ -383,23 +383,12 @@ start_service() {
fi fi
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 if [ $DEBUG ]; then
# Start /federated/apps/SERVICE with output to console for debug # 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
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up && break
sleep 5s
TRIES=$((TRIES+1))
done
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
else else
while [ "$TRIES" -lt 100 ]; do docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &>/dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null && break
sleep 5s
TRIES=$((TRIES+1))
done
# Keep trying service port to make sure it's up before # Keep trying service port to make sure it's up before
# we proceed # we proceed
@ -1469,8 +1458,9 @@ EOF
dnf -y --refresh install docker docker-compose dnf -y --refresh install docker docker-compose
#wget https://file-store.openmandriva.org/api/v1/file_stores/142e76f40a398c59aaafa727bdf889fb1511d715 #wget https://file-store.openmandriva.org/api/v1/file_stores/142e76f40a398c59aaafa727bdf889fb1511d715
#sudo rpm -Uvh --oldpackage docker-27.5.0* #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 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 <<EOF cat > /etc/docker/daemon.json <<EOF
{ {
"max-concurrent-downloads": 3, "max-concurrent-downloads": 3,