improve caching & fix auth build

Signed-off-by: MatsG23 <60609373+MatsG23@users.noreply.github.com>

Author: MatsG23

Dockerfile-auth

@@ -14,12 +14,6 @@ RUN apt-get install -y --no-install-recommends \
         git \
         python3-venv
 
-# Install Lua
-ARG NO_LUA_JIT="s390x arm64"
-RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
-    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
-    apt-get clean
-
 # TODO: make sure /source looks roughly the same from git or tar
 WORKDIR /source
 
@@ -28,7 +22,7 @@ COPY builder-support/ builder-support/
 
 # TODO: control file is not in tarballs at all right now
 RUN mk-build-deps -i -t 'apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends' builder-support/debian/authoritative/debian-buster/control && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
+    apt-get clean
 
 # build and install
 
@@ -51,8 +45,13 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     fi && \
     BUILDER_MODULES=authoritative autoreconf -vfi
 
+# Lua install merged with build because Make seems to need the Lua installation name
 # TODO: simplify repeated -C calls with SUBDIRS?
-RUN mkdir /build && \
+ARG NO_LUA_JIT="s390x arm64"
+RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    mkdir /build && \
     ./configure \
       --with-lua=${LUAVER} \
       --sysconfdir=/etc/powerdns \

Dockerfile-dnsdist

@@ -18,12 +18,6 @@ RUN apt-get install -y --no-install-recommends \
         meson \
         ninja-build
 
-# Install Lua
-ARG NO_LUA_JIT="s390x arm64"
-RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
-    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
-    apt-get clean
-
 # TODO: make sure /source looks roughly the same from git or tar
 WORKDIR /source
 
@@ -32,7 +26,7 @@ COPY builder-support/ builder-support/
 
 # TODO: control file is not in tarballs at all right now
 RUN mk-build-deps -i -t 'apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends' builder-support/debian/dnsdist/debian-bookworm/control && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
+    apt-get clean
 
 WORKDIR /source/builder-support/helpers/
 RUN ./install_rust.sh && \
@@ -53,6 +47,12 @@ WORKDIR /source/pdns/dnsdistdist
 # avoid installing pandoc and venv
 RUN touch dnsdist.1
 
+# Install Lua
+ARG NO_LUA_JIT="s390x arm64"
+RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
 RUN mkdir /build && \
     BUILDDIR=$(mktemp -d) && \
     IS_RELEASE="${DOCKER_FAKE_RELEASE}" \

Dockerfile-recursor

@@ -22,12 +22,6 @@ RUN apt-get install -y --no-install-recommends \
         meson \
         ninja-build
 
-# Install Lua
-ARG NO_LUA_JIT="s390x"
-RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
-    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
-    apt-get clean
-
 # TODO: make sure /source looks roughly the same from git or tar
 WORKDIR /source
 
@@ -36,7 +30,7 @@ COPY builder-support/ builder-support/
 
 # TODO: control file is not in tarballs at all right now
 RUN mk-build-deps -i -t 'apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends' builder-support/debian/recursor/debian-buster/control && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
+    apt-get clean
 
 # Install Rust
 COPY builder-support/helpers/install_rust.sh install_rust.sh
@@ -58,6 +52,12 @@ WORKDIR /source/pdns/recursordist
 # avoid installing pandoc
 RUN touch pdns_recursor.1 rec_control.1
 
+# Install Lua
+ARG NO_LUA_JIT="s390x"
+RUN LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    apt-get install -y --no-install-recommends lib${LUAVER}-*dev && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
 RUN mkdir /build && \
     BUILDDIR=$(mktemp -d) && \
     IS_RELEASE="${DOCKER_FAKE_RELEASE}" \