diff --git a/lib/functions.sh b/lib/functions.sh index 191e686..ece3305 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -1459,23 +1459,7 @@ EOF mkdir -p /var/run ln -s /run/user/0/podman/podman.sock /var/run/docker.sock else - # Grab an older version of docker instead of just "dnf install docker" - # because 28.0.0 is potentially dangerous, see - # https://github.com/moby/moby/issues/49513 - # https://github.com/moby/moby/issues/49511 - # https://github.com/moby/moby/issues/49498 - if [ "$(uname -m)" = "aarch64" ]; then - wget https://file-store.openmandriva.org/api/v1/file_stores/b435b807ff1b6bc0eabcc5792e9e652b427b438a - elif cat /proc/cpuinfo |grep -q AuthenticAMD; then - # 27.5.0-1 -- wget https://file-store.openmandriva.org/api/v1/file_stores/142e76f40a398c59aaafa727bdf889fb1511d715 - # 28.0.0-2 -- wget https://file-store.openmandriva.org/api/v1/file_stores/6a61e12ee92feacc130a749d8ed7848827e7489c - wget https://lindev.ch/docker-28.0.0-2-omv2590.znver1.rpm - else - wget https://file-store.openmandriva.org/api/v1/file_stores/dd69c9573a9c945fdb8dcfdbfc6ba823b914bc24 - fi - sudo dnf -y install docker-*.rpm - echo 'exclude=docker' >>/etc/dnf/dnf.conf - dnf -y --refresh install docker-compose + dnf -y --refresh install docker docker-compose 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