diff --git a/build_files/dx/00-dx.sh b/build_files/dx/00-dx.sh index 006eff9f..612c3114 100755 --- a/build_files/dx/00-dx.sh +++ b/build_files/dx/00-dx.sh @@ -74,16 +74,15 @@ if [[ ! "${IMAGE_NAME}" =~ nvidia ]]; then fi # Docker packages from their repo -# TODO: enable ones these are available for Fedora 44 -#dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo -#sed -i "s/enabled=.*/enabled=0/g" /etc/yum.repos.d/docker-ce.repo -#dnf -y install --enablerepo=docker-ce-stable \ -# containerd.io \ -# docker-buildx-plugin \ -# docker-ce \ -# docker-ce-cli \ -# docker-compose-plugin \ -# docker-model-plugin +dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo +sed -i "s/enabled=.*/enabled=0/g" /etc/yum.repos.d/docker-ce.repo +dnf -y install --enablerepo=docker-ce-stable \ + containerd.io \ + docker-buildx-plugin \ + docker-ce \ + docker-ce-cli \ + docker-compose-plugin \ + docker-model-plugin # VSCode package from Microsoft repo echo "Installing VSCode from official repo..." @@ -127,9 +126,9 @@ if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then fi # Enable DX services -#if rpm -q docker-ce >/dev/null; then -# systemctl enable docker.socket -#fi +if rpm -q docker-ce >/dev/null; then + systemctl enable docker.socket +fi systemctl enable podman.socket systemctl enable swtpm-workaround.service systemctl enable ublue-os-libvirt-workarounds.service diff --git a/build_files/dx/10-tests-dx.sh b/build_files/dx/10-tests-dx.sh index 2b792063..ee1ca784 100755 --- a/build_files/dx/10-tests-dx.sh +++ b/build_files/dx/10-tests-dx.sh @@ -17,7 +17,7 @@ for package in "${IMPORTANT_PACKAGES_DX[@]}"; do done IMPORTANT_UNITS=( - #docker.socket + docker.socket podman.socket )