tests/docker: add support for DEB_KEYRING

stsquad · stsquad · commit 4c5aeb12387f · 2020-07-27T09:41:35.000+01:00
For installing stuff from sid or ports you may need to manually specify the location of the keyring. You can even import keys into your personal keyring and point it there, e.g.: gpg --keyserver keyring.debian.org --recv-keys 84C573CD4E1AFD6C make docker-binfmt-image-debian-sid-hppa DEB_TYPE=sid DEB_ARCH=hppa \ DEB_URL=http://ftp.ports.debian.org/debian-ports/ \ EXECUTABLE=./hppa-linux-user/qemu-hppa V=1 \ DEB_KEYRING=${HOME}/.gnupg/pubring.kbx Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200724064509.331-12-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -79,6 +79,13 @@ else
     fi
 fi
 
+#
+# Add optional args
+#
+if [ -n "${DEB_KEYRING}" ]; then
+    DEBOOTSTRAP="${DEBOOTSTRAP} --keyring=${DEB_KEYRING}"
+fi
+
 #
 # Finally check to see if any qemu's are installed
 #

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,13 @@ else`
`79`	`79`	`fi`
`80`	`80`	`fi`
`81`	`81`
	`82`	`+#`
	`83`	`+# Add optional args`
	`84`	`+#`
	`85`	`+if [ -n "${DEB_KEYRING}" ]; then`
	`86`	`+ DEBOOTSTRAP="${DEBOOTSTRAP} --keyring=${DEB_KEYRING}"`
	`87`	`+fi`
	`88`	`+`
`82`	`89`	`#`
`83`	`90`	`# Finally check to see if any qemu's are installed`
`84`	`91`	`#`