diff --git a/fedora-atomic/Containerfile.fedora-distrobox b/fedora-atomic/Containerfile.fedora-distrobox index b2f7ca2..a123570 100644 --- a/fedora-atomic/Containerfile.fedora-distrobox +++ b/fedora-atomic/Containerfile.fedora-distrobox @@ -1,47 +1,29 @@ -FROM registry.fedoraproject.org/fedora-toolbox:40 +FROM registry.fedoraproject.org/fedora-toolbox:41 -RUN sudo dnf groupinstall -y --allowerasing \ - "Development Tools" \ - "Development Libraries" \ - "KDE Plasma Workspaces" +RUN sudo dnf5 group install -y \ + development-tools \ + c-development \ + kde-software-development \ + kf6-software-development -RUN sudo dnf install -y \ - cmake \ - extra-cmake-modules \ - qt5-qtbase-devel \ - qt5-qtdeclarative-devel \ - qt5-qtquickcontrols2-devel \ - kf5-kirigami2-devel \ - kf5-ki18n-devel \ - kf5-kcoreaddons-devel \ - qqc2-breeze-style \ - qt5-qtsvg-devel \ - kf5-kconfig-devel \ +RUN sudo dnf5 install -y \ pyotherside \ python3-dateutil \ python3-keyring \ python3-requests \ python3-build \ + python3-pip \ mercurial \ mercurial-rust \ ansible \ ansible-lint \ flatpak-builder \ - xclip \ htop \ - qt6-qtbase-devel \ - qt6-qtwebengine-devel \ - qt6-qtwebengine-devtools \ - qt6-linguist \ libxslt-devel \ libsecret-devel \ - mutt \ - msmtp \ - lynx \ virt-manager \ hugo \ openssl \ - wl-clipboard \ java-17-openjdk \ java-17-openjdk-devel \ maven \ @@ -51,5 +33,4 @@ RUN sudo dnf install -y \ oniguruma-devel \ nodejs-bash-language-server \ rpm-spec-language-server \ - clang-tools-extra \ - gkrellm + clang-tools-extra diff --git a/fedora-atomic/build-distrobox.sh b/fedora-atomic/build-distrobox.sh index f2e8e84..00c6669 100755 --- a/fedora-atomic/build-distrobox.sh +++ b/fedora-atomic/build-distrobox.sh @@ -16,8 +16,8 @@ fi case "${1}" in fedora) - NAME="f40" - IMAGE="fedora-thrrgilag:40" + NAME="f41" + IMAGE="fedora-thrrgilag:41" BUILDFILE="Containerfile.fedora-distrobox";; debian) NAME="debian-bookworm"