From 1e1ce668187e194b64e84fdd20ab8bfd85d407fd Mon Sep 17 00:00:00 2001
From: Hadrien Patte <hadrien.patte@protonmail.com>
Date: Sat, 21 Sep 2024 01:09:53 +0200
Subject: [PATCH] Add dpkg status file to images

---
 .github/workflows/build-images.yaml | 1 +
 images/prowlarr/Dockerfile          | 9 ++++++---
 images/qbittorrent/Dockerfile       | 9 ++++++---
 images/radarr/Dockerfile            | 9 ++++++---
 images/sonarr/Dockerfile            | 9 ++++++---
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index a4c1c55..9085b94 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - dpkg
   schedule:
     - cron: '0 0 * * *'
 
diff --git a/images/prowlarr/Dockerfile b/images/prowlarr/Dockerfile
index d82a0cf..629d3e8 100644
--- a/images/prowlarr/Dockerfile
+++ b/images/prowlarr/Dockerfile
@@ -8,12 +8,15 @@ ARG CHISEL_VERSION
 # Install chisel and build rootfs with prowlarr dependencies
 RUN \
     go install github.com/canonical/chisel/cmd/chisel@${CHISEL_VERSION} \
-    && mkdir /rootfs \
-    && chisel cut \
+    && curl -LO https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && chmod +x ./chisel-wrapper \
+    && apt update \
+    && apt install file --yes \
+    && mkdir -p /rootfs/var/lib/dpkg \
+    && ./chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-24.04 \
         --root /rootfs \
         base-files_base \
-        base-files_release-info \
         ca-certificates_data \
         libicu74_libs \
         libsqlite3-0_libs \
diff --git a/images/qbittorrent/Dockerfile b/images/qbittorrent/Dockerfile
index e3970dd..a4c5756 100644
--- a/images/qbittorrent/Dockerfile
+++ b/images/qbittorrent/Dockerfile
@@ -8,12 +8,15 @@ ARG CHISEL_VERSION
 # Install chisel and build rootfs
 RUN \
     go install github.com/canonical/chisel/cmd/chisel@${CHISEL_VERSION} \
-    && mkdir /rootfs \
-    && chisel cut \
+    && curl -LO https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && chmod +x ./chisel-wrapper \
+    && apt update \
+    && apt install file --yes \
+    && mkdir -p /rootfs/var/lib/dpkg \
+    && ./chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-24.04 \
         --root /rootfs \
         base-files_base \
-        base-files_release-info \
         ca-certificates_data \
     && useradd \
         --root /rootfs \
diff --git a/images/radarr/Dockerfile b/images/radarr/Dockerfile
index d870df1..c225abd 100644
--- a/images/radarr/Dockerfile
+++ b/images/radarr/Dockerfile
@@ -8,12 +8,15 @@ ARG CHISEL_VERSION
 # Install chisel and build rootfs with radarr dependencies
 RUN \
     go install github.com/canonical/chisel/cmd/chisel@${CHISEL_VERSION} \
-    && mkdir /rootfs \
-    && chisel cut \
+    && curl -LO https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && chmod +x ./chisel-wrapper \
+    && apt update \
+    && apt install file --yes \
+    && mkdir -p /rootfs/var/lib/dpkg \
+    && ./chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-24.04 \
         --root /rootfs \
         base-files_base \
-        base-files_release-info \
         ca-certificates_data \
         libicu74_libs \
         libsqlite3-0_libs \
diff --git a/images/sonarr/Dockerfile b/images/sonarr/Dockerfile
index f34c461..9bee003 100644
--- a/images/sonarr/Dockerfile
+++ b/images/sonarr/Dockerfile
@@ -8,12 +8,15 @@ ARG CHISEL_VERSION
 # Install chisel and build rootfs with sonarr dependencies
 RUN \
     go install github.com/canonical/chisel/cmd/chisel@${CHISEL_VERSION} \
-    && mkdir /rootfs \
-    && chisel cut \
+    && curl -LO https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && chmod +x ./chisel-wrapper \
+    && apt update \
+    && apt install file --yes \
+    && mkdir -p /rootfs/var/lib/dpkg \
+    && ./chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-24.04 \
         --root /rootfs \
         base-files_base \
-        base-files_release-info \
         ca-certificates_data \
         libicu74_libs \
         libsqlite3-0_libs \