manibuilder/anita: Move ARGS right before their usage
This makes it easier for docker to re-use image artifacts, e.g. the
Debian installation part can be shared among all anita images now.
Change-Id: I9d04c477b89b8e09b11e73c60e7a6cc03437d0ea
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/70917
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita
index 21e168e..84ecc58 100644
--- a/util/manibuilder/Dockerfile.anita
+++ b/util/manibuilder/Dockerfile.anita
@@ -1,8 +1,5 @@
FROM debian:bullseye
-ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All
-ARG INST_IMG=http://ftp.de.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/
-
RUN \
useradd -p locked -m mani && \
apt-get -qq update && \
@@ -16,6 +13,7 @@
ARG DISK_SIZE=1G
ARG INSTALL_MEM=128M
+ARG INST_IMG=http://ftp.de.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/
USER mani
RUN cd && mkdir .ccache && chown mani:mani .ccache && \
anita --sets kern-GENERIC,modules,base,etc,comp \
@@ -26,6 +24,7 @@
ARG EXTRA_PKG=""
ARG RUNTIME_MEM=128M
ARG ORIGIN=https://review.coreboot.org/flashrom-stable.git
+ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All
RUN cd && anita --persist --memory-size=${RUNTIME_MEM} --run \
"echo 'dhcpcd' >init && \
echo 'export PKG_PATH=${PKG_PATH}' >>init && \