From 0598fb3dba147d62922881e67c4992fb671f560f Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Wed, 21 Jun 2023 00:38:32 +0200
Subject: [PATCH] Make final dl cache image FROM scratch

---
 generate.sh                           | 4 ++--
 scripts.d/50-aom.sh                   | 2 +-
 scripts.d/50-aribb24/50-libaribb24.sh | 2 +-
 scripts.d/50-zvbi.sh                  | 2 +-
 util/vars.sh                          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/generate.sh b/generate.sh
index 530aed4..c9fda9b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -52,8 +52,8 @@ to_df "FROM base AS intermediate"
 cat Dockerfile.dl.final >> "$TODF"
 rm Dockerfile.dl.final
 
-to_df "FROM base"
-to_df "COPY --from=intermediate \$FFBUILD_DLDIR/. \$FFBUILD_DLDIR"
+to_df "FROM scratch"
+to_df "COPY --from=intermediate /opt/ffdl/. /"
 
 if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then
     exit 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 95458f2..7c8cdb0 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh
index 4232541..c032178 100755
--- a/scripts.d/50-aribb24/50-libaribb24.sh
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh
index 6eaa22e..5f7cb97 100755
--- a/scripts.d/50-zvbi.sh
+++ b/scripts.d/50-zvbi.sh
@@ -8,7 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
 }
 
 ffbuild_dockerdl() {
diff --git a/util/vars.sh b/util/vars.sh
index 030ac15..0fd91ef 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -53,7 +53,7 @@ ffbuild_dockerlayer_dl() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh"
 }
 
 ffbuild_dockerlayer() {