6 files changed, 53 insertions, 87 deletions
diff --git a/build-containers/bookworm/Containerfile b/build-containers/bookworm/Containerfile
deleted file mode 100644
index 852e2e8..0000000
--- a/build-containers/bookworm/Containerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM docker.io/library/debian:bookworm
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y \
-    make \
-    clang \
-    lld \
-    curl \
-    tar \
-    gzip \
-    gettext \
-    libgtk-4-dev \
-    libadwaita-1-dev \
-    libgtksourceview-5-dev \
-    pkg-config \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install rust toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install cargo-deb
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-deb --no-confirm
diff --git a/build-containers/fedora-rawhide/Containerfile b/build-containers/fedora-rawhide/Containerfile
index 6869330..3db886c 100644
--- a/build-containers/fedora-rawhide/Containerfile
+++ b/build-containers/fedora-rawhide/Containerfile
@@ -1,23 +1,15 @@
 FROM docker.io/library/fedora:rawhide
 
 RUN dnf install -y \
-    make \
-    clang \
-    lld \
-    curl \
-    tar \
-    gzip \
+    meson \
+    rpm-build \
+    cargo \
+    rust \
+    desktop-file-utils \
+    libappstream-glib \
     gettext \
     gtk4-devel \
     libadwaita-devel \
     gtksourceview5-devel \
     pkg-config \
     && dnf clean all
-
-# Install rust toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install cargo-generate-rpm
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-generate-rpm --no-confirm
diff --git a/build-containers/fedora43/Containerfile b/build-containers/fedora43/Containerfile
index 8b4b3aa..ad16530 100644
--- a/build-containers/fedora43/Containerfile
+++ b/build-containers/fedora43/Containerfile
@@ -1,23 +1,15 @@
 FROM docker.io/library/fedora:43
 
 RUN dnf install -y \
-    make \
-    clang \
-    lld \
-    curl \
-    tar \
-    gzip \
+    meson \
+    rpm-build \
+    cargo \
+    rust \
+    desktop-file-utils \
+    libappstream-glib \
     gettext \
     gtk4-devel \
     libadwaita-devel \
     gtksourceview5-devel \
     pkg-config \
     && dnf clean all
-
-# Install rust toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install cargo-generate-rpm
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-generate-rpm --no-confirm
diff --git a/build-containers/fedora44/Containerfile b/build-containers/fedora44/Containerfile
index fb54803..18ff672 100644
--- a/build-containers/fedora44/Containerfile
+++ b/build-containers/fedora44/Containerfile
@@ -1,24 +1,15 @@
 FROM docker.io/library/fedora:44
 
 RUN dnf install -y \
-    make \
-    clang \
-    lld \
-    curl \
-    tar \
-    gzip \
+    meson \
+    rpm-build \
+    cargo \
+    rust \
+    desktop-file-utils \
+    libappstream-glib \
     gettext \
     gtk4-devel \
     libadwaita-devel \
     gtksourceview5-devel \
     pkg-config \
     && dnf clean all
-
-# Install rust toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install cargo-generate-rpm
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-generate-rpm --no-confirm
-
diff --git a/build-containers/forky/Containerfile b/build-containers/forky/Containerfile
index 386fe00..ae72361 100644
--- a/build-containers/forky/Containerfile
+++ b/build-containers/forky/Containerfile
@@ -3,13 +3,17 @@ FROM docker.io/library/debian:forky
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \
-    make \
-    clang \
-    lld \
-    ca-certificates \
+    debhelper-compat \
+    meson \
+    cargo \
+    rustc \
+    desktop-file-utils \
+    appstream-util \
     curl \
+    ca-certificates \
     tar \
     gzip \
+    file \
     gettext \
     libgtk-4-dev \
     libadwaita-1-dev \
@@ -17,11 +21,3 @@ RUN apt-get update && apt-get install -y \
     pkg-config \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
-
-# Install rust toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install cargo-deb
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-deb --no-confirm
diff --git a/build-containers/trixie/Containerfile b/build-containers/trixie/Containerfile
index 904de18..46c2111 100644
--- a/build-containers/trixie/Containerfile
+++ b/build-containers/trixie/Containerfile
@@ -3,12 +3,16 @@ FROM docker.io/library/debian:trixie
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \
-    make \
-    clang \
-    lld \
+    debhelper-compat \
+    equivs \
+    meson \
+    desktop-file-utils \
+    appstream-util \
     curl \
+    ca-certificates \
     tar \
     gzip \
+    file \
     gettext \
     libgtk-4-dev \
     libadwaita-1-dev \
@@ -20,7 +24,24 @@ RUN apt-get update && apt-get install -y \
 # Install rust toolchain
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
+ENV RUSTUP_TOOLCHAIN=stable
 
-# Install cargo-deb
-RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash \
-    && cargo binstall cargo-deb --no-confirm
+RUN apt-get install -y --no-install-recommends equivs && \
+  mkdir -p /tmp/equivs && cd /tmp/equivs && \
+  cat > rust-rustup.control <<'EOF'
+Section: misc
+Priority: optional
+Standards-Version: 4.7.4
+Package: rust-rustup
+Version: 1.92.0
+Provides: rustc (= 1.92.0), cargo (= 1.92.0)
+Description: Dummy package claiming rustc/cargo are provided by rustup.
+  This package exists solely to satisfy dpkg Build-Depends checks to
+  create the binary package from the source package.
+EOF
+
+RUN cd /tmp/equivs && \
+  equivs-build rust-rustup.control && \
+  dpkg -i rust-rustup_1.92.0_all.deb && \
+  rm -rf /tmp/equivs && \
+  apt-get remove -y equivs && apt-get autoremove -y && apt-get clean