commit:     23f03395d4114bb3ea90793a434428d29a0ba040
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  3 02:10:24 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  3 02:56:53 2026 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=23f03395

{portage,stage3}.Dockerfile: use end-of-arguments in a few places

Signed-off-by: Sam James <sam <AT> gentoo.org>

 portage.Dockerfile | 10 +++++-----
 stage3.Dockerfile  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/portage.Dockerfile b/portage.Dockerfile
index 1e35e04..7227f1a 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -38,18 +38,18 @@ RUN <<-EOF
     gpg --no-default-keyring --quick-lsign-key ${SIGNING_KEY}
 
     gpg_temp=$(mktemp -d)
-    gpg --batch --status-fd 3 --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" 3> 
${gpg_temp}/gpg.status
+    gpg --batch --status-fd 3 --verify -- "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" 
3> ${gpg_temp}/gpg.status
     for token in GOODSIG VALIDSIG TRUST_FULLY; do
         [[ $'\n'$(<${gpg_temp}/gpg.status) == *$'\n[GNUPG:] '"${token} "* ]] 
|| exit 1
     done
 
-    md5sum -c ${SNAPSHOT}.md5sum
+    md5sum -c -- ${SNAPSHOT}.md5sum
     mkdir -p var/db/repos var/cache/binpkgs var/cache/distfiles
     tar xJpf ${SNAPSHOT} -C var/db/repos
     mv var/db/repos/portage var/db/repos/gentoo
-    rm ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum
-    rm ${gpg_temp}/gpg.status
-    rmdir ${gpg_temp}
+    rm -- ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum
+    rm -- ${gpg_temp}/gpg.status
+    rmdir -- ${gpg_temp}
 EOF
 
 FROM busybox:latest

diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 7b8620d..d08f9f7 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -42,14 +42,14 @@ RUN <<-EOF
     gpg --no-default-keyring --quick-lsign-key ${SIGNING_KEY}
 
     # obtain and extract stage3
-    wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt"
-    gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt"
+    wget -q -- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt"
+    gpg --verify -- "latest-stage3-${MICROARCH}${SUFFIX}.txt"
     STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut 
-f 1 -d ' ')"
     echo "STAGE3PATH:" ${STAGE3PATH}
     STAGE3="$(basename ${STAGE3PATH})"
     wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.asc"
     gpg_temp=$(mktemp -d)
-    gpg --batch --status-fd 3 --verify "${STAGE3}.asc" "${STAGE3}" 3> 
${gpg_temp}/gpg.status
+    gpg --batch --status-fd 3 --verify -- "${STAGE3}.asc" "${STAGE3}" 3> 
${gpg_temp}/gpg.status
     for token in GOODSIG VALIDSIG TRUST_FULLY; do
         [[ $'\n'$(<${gpg_temp}/gpg.status) == *$'\n[GNUPG:] '"${token} "* ]] 
|| exit 1
     done

Reply via email to