squash! address code reviews

aduh95 · aduh95 · commit a3d69470b685 · 2026-03-26T16:12:19.000+01:00
diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/20/trixie/Dockerfile b/20/trixie/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/22/trixie/Dockerfile b/22/trixie/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/24/bookworm/Dockerfile b/24/bookworm/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/24/bullseye/Dockerfile b/24/bullseye/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/24/trixie/Dockerfile b/24/trixie/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/25/bookworm/Dockerfile b/25/bookworm/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/25/bullseye/Dockerfile b/25/bullseye/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/25/trixie/Dockerfile b/25/trixie/Dockerfile
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "https://raw.githubusercontent.com/nodejs/release-keys/7b6eb2d6ab524bb30487f31612cdbeb35ae37533/gpg-only-active-keys/pubring.kbx" && echo "70da4cac9d0487c1776c66403d5f6fe79991f1ba34fae96416037de1950197e1  pubring.kbx" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   esac \
   && export GNUPGHOME="$(mktemp -d)" \
   && set -ex \
-  && command -v gpgv >/dev/null || (apt-get update && apt-get install gpgv) \
+  && command -v gpgv >/dev/null || (apt-get update && apt-get install --no-install-recommends -y gpgv) \
   && (cd "$GNUPGHOME" && curl -fsSLO --compressed "${NODEJS_KEYRING_URL}" && echo "${NODEJS_KEYRING_HASH}" | sha256sum -c) \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/update-keys.sh b/update-keys.sh
@@ -2,6 +2,60 @@
 
 KEYRING_URL=$(curl -fsIo /dev/null -w '%header{Location}' https://github.com/nodejs/release-keys/raw/HEAD/gpg-only-active-keys/pubring.kbx)
 TMP_DIR=$(mktemp -d)
+trap "rm -r "$TMP_DIR"; trap - EXIT; exit" EXIT INT HUP
 (cd "$TMP_DIR" && curl -fsSO "$KEYRING_URL" && sha256sum pubring.kbx) > keys/nodejs.shasum
+
+[ \
+"$(gpg --no-default-keyring --keyring "$TMP_DIR/pubring.kbx" --list-keys --with-colons | sort)" = \
+'fpr:::::::::0A178CD0FE03CB4F8780980A039F94E89826F891:
+fpr:::::::::108F52B48DB57BB0CC439B2997B01419BD92F80A:
+fpr:::::::::4104B1A1F784A8AE9E0C2A5105DE7928107F3DC0:
+fpr:::::::::5BE8A3F6C8A5C01D106C0AD820B1A390B168D356:
+fpr:::::::::74CD01639B02F3361D0918140D0792FB9ACAD426:
+fpr:::::::::7C1F423FA1A6C8F34C1C9924900A296076CFC675:
+fpr:::::::::80E6380360B2E90F2C9A3AA6C0AB7FA4DC8F4063:
+fpr:::::::::86C8D74642E67846F8E120284DAA80D1E737BC9F:
+fpr:::::::::890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4:
+fpr:::::::::8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600:
+fpr:::::::::9FC51CEA112B1655FA9398E2E04111EEE1A956A5:
+fpr:::::::::A363A499291CBBC940DD62E41F10027AF002F8B0:
+fpr:::::::::A6023530FC53461FEC91F99C04CD3F2FDE079578:
+fpr:::::::::C2B25D9B4272DB29565BA87F3C7824F39A895758:
+fpr:::::::::C4960C6DAA2AEBC352F3E5B8E140F61BC5979DCC:
+fpr:::::::::C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C:
+fpr:::::::::CC68F5A3106FF448322E48ED27F5E38D5B0A215F:
+fpr:::::::::DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7:
+fpr:::::::::EDC5FCAE2317BA6060FDB92C4708964F8085DFE7:
+pub:-:255:22:C77ABFA00DDBF2B7:1677815220:::-:::scESC:::::ed25519:::0:
+pub:-:3072:1:8BEAB4DFCF555EF4:1652808932:1783525729::-:::scESC::::::23::0:
+pub:-:4096:1:1F10027AF002F8B0:1561700538:1843474974::-:::scESC::::::23::0:
+pub:-:4096:1:27F5E38D5B0A215F:1711645245:2027005245::-:::scESC::::::23::0:
+pub:-:4096:1:770F7A9A5AE15600:1460037406:2080645689::-:::scESC::::::23::0:
+pub:-:4096:1:97B01419BD92F80A:1500316168:::-:::scESC::::::23::0:
+pub:-:4096:1:C43CEC45C17AB93C:1572264397:::-:::scESC::::::23::0:
+pub:u:255:22:20B1A390B168D356:1751136988:::u:::scESC:::::ed25519:::0:
+sub:-:255:18:0D0792FB9ACAD426:1677815220::::::e:::::cv25519::
+sub:-:255:22:4DAA80D1E737BC9F:1763715081:1796821732:::::s:::::ed25519::
+sub:-:3072:1:05DE7928107F3DC0:1652808932:1783525772:::::e::::::23:
+sub:-:4096:1:3C7824F39A895758:1752853787:1815925787:::::s::::::23:
+sub:-:4096:1:4708964F8085DFE7:1460037406:1796821732:::::e::::::23:
+sub:-:4096:1:900A296076CFC675:1752854012:1815926012:::::e::::::23:
+sub:-:4096:1:C0AB7FA4DC8F4063:1711645245:2027005245:::::e::::::23:
+sub:-:4096:1:E04111EEE1A956A5:1500316168::::::e::::::23:
+sub:-:4096:1:E140F61BC5979DCC:1572264397::::::e::::::23:
+sub:e:4096:1:04CD3F2FDE079578:1561700538:1748764157:::::esa::::::23:
+sub:u:255:18:039F94E89826F891:1751136988::::::e:::::cv25519::
+tru::1:1773151472:0:3:1:5
+uid:-::::1500316168::3CFC768A41C5BE8C983059A28D8595626C6CD057::Ruy Adorno <ruyadorno@hotmail.com>::::::::::0:
+uid:-::::1601568743::7BB2C566F0EF871E6DCE4750115AF255D9CB7C6E::Richard Lau <rlau@redhat.com>::::::::::0:
+uid:-::::1677815220::AF13231F48008C33AEA635A785BA0A1992AF63C4::Juan José Arboleda <soyjuanarbol@gmail.com>::::::::::0:
+uid:-::::1711645245::443D6CD345E6710170F58F30FC9FB06B252609BE::marco-ippolito <marcoippolito54@gmail.com>::::::::::0:
+uid:-::::1720453729::66A91B5771A948CA2971C034212CEE70A68C9EB0::RafaelGSS <rafael.nunu@hotmail.com>::::::::::0:
+uid:-::::1748866974::BB866FA1E1E4EC9C258B9C5853C506BD8B09A621::ulises Gascon <ulisesgascongonzalez@gmail.com>::::::::::0:
+uid:-::::1750870996::01B4EEEA930298F058DF62CD37570ECC9365C0BE::Richard Lau <richard.lau@ibm.com>::::::::::0:
+uid:-::::1765285689::5B411E4EE395C91BA7BE1C76FE7C0DC49700A620::Michaël Zasso (Targos) <targos@protonmail.com>::::::::::0:
+uid:r::::::1312A91B920AF6003812E73DC6C19CC96FABFB7A::Richard Lau <riclau@uk.ibm.com>::::::::::0:
+uid:u::::1751136988::7F77C9100C2C063FE76864416CF5F377EFAF96DC::Antoine du Hamel <duhamelantoine1995@gmail.com>::::::::::0:
+uid:u::::1773151025::4B64E9AA67E282998FC0CD9E607DDC59D07EF0D6::Antoine du Hamel <antoine.duhamel@platformatic.dev>::::::::::0:' ]
+
 echo "$KEYRING_URL" > keys/nodejs.url
-rm -r "$TMP_DIR"
