chore: get docker packages from docker-ce again (#2999)
partial revert of: 70d98ffa
resolves: https://github.com/ublue-os/aurora/issues/2919
This commit is contained in:
parent
674303ff17
commit
969ea00ce2
2 changed files with 11 additions and 27 deletions
|
|
@ -64,10 +64,6 @@ fi
|
|||
echo "Installing ${#FEDORA_PACKAGES[@]} DX packages from Fedora repos..."
|
||||
dnf5 -y install "${FEDORA_PACKAGES[@]}"
|
||||
|
||||
# docker is not available for f45 yet
|
||||
# https://github.com/docker/docker-ce-packaging/issues/1353
|
||||
# TODO: get it from docker again once it's available
|
||||
if [[ $(rpm -E %fedora) == "44" ]]; then
|
||||
# Docker packages from their repo
|
||||
dnf -y install --from-repo=docker-ce-stable \
|
||||
containerd.io \
|
||||
|
|
@ -75,17 +71,6 @@ if [[ $(rpm -E %fedora) == "44" ]]; then
|
|||
docker-ce \
|
||||
docker-ce-cli \
|
||||
docker-compose-plugin
|
||||
else
|
||||
# we get this from common, the fedora package provides the exact same one
|
||||
rm -f /usr/lib/sysusers.d/docker.conf
|
||||
|
||||
dnf -y install \
|
||||
containerd \
|
||||
docker-buildx \
|
||||
moby-engine \
|
||||
docker-cli \
|
||||
docker-compose
|
||||
fi
|
||||
|
||||
# VSCode package from Microsoft repo
|
||||
dnf -y install --from-repo=code \
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@ set -eoux pipefail
|
|||
|
||||
IMPORTANT_PACKAGES_DX=(
|
||||
code
|
||||
# containerd.io
|
||||
containerd
|
||||
# docker-ce
|
||||
# docker-buildx-plugin
|
||||
# docker-compose-plugin
|
||||
containerd.io
|
||||
docker-ce
|
||||
docker-buildx-plugin
|
||||
docker-compose-plugin
|
||||
flatpak-builder
|
||||
libvirt
|
||||
qemu
|
||||
|
|
|
|||
Loading…
Reference in a new issue