From d9cd69b336d98c4e91d6eaa5ef17039f8eb886ce Mon Sep 17 00:00:00 2001
From: Takayuki Oda <takayuki@odashi.me>
Date: Fri, 15 Oct 2021 13:00:31 +0900
Subject: [PATCH] Update latest key for Danielle Adams

GPG key for Danielle Adams have been changed in https://github.com/nodejs/node/pull/36793.
Because of that, installing latest node versions gets an error as reported in https://github.com/GoogleCloudPlatform/nodejs-docker/issues/214.

I guess we still need to have his previous GPG keys to install previous versions, so instead of simply replacing the key, I rename old key to have prefix `Prev` and put new key to "Latest keys" section.
---
 runtime-image/bin/gen_keys.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime-image/bin/gen_keys.sh b/runtime-image/bin/gen_keys.sh
index 0e929e30..355ee969 100755
--- a/runtime-image/bin/gen_keys.sh
+++ b/runtime-image/bin/gen_keys.sh
@@ -15,12 +15,13 @@ IsaacZSchlueter=93C7E9E91B49E432C2F75674B0A78B0A6C481CF6
 ItaloACasas=56730D5401028683275BD23C23EFEFE93C4CFFFE
 JulienGilli=114F43EE0176B71C7BC219DD50A3051F888C628D
 TimothyJFontaine=7937DFD2AB06298B2293C3187D33FF9D0246406D
+PrevDanielleAdams=1C050899334244A8AF75E53792EF661D867B9DFA
 
 #Latest releases are signed with these keys
 
 BethGriggs=4ED778F539E3634C779C87C6D7062848A1AB005C
 ColinIhrig=94AE36675C464D64BAFA68DD7434390BDBE9B9C5
-DanielleAdams=1C050899334244A8AF75E53792EF661D867B9DFA
+DanielleAdams=74F12602B6F1C4E913FAA37AD3A89613643B6201
 JamesMSnell=71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
 MichaelZasso=8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
 MylesBorins=C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
@@ -30,7 +31,7 @@ RubenBridgewater=A48C2BEE680E841632CD4E44F07496B3EB3C1762
 RuyAdorno=108F52B48DB57BB0CC439B2997B01419BD92F80A
 ShelleyVohr=B9E2F5981AA6E0CD28160D9FF13993A75599653C
 
-keylist="${EvanLucas} ${GibsonFahnestock} ${JeremiahSenkpiel} ${ChrisDickinson} ${IsaacZSchlueter} ${ItaloACasas} ${JulienGilli} ${TimothyJFontaine} ${BethGriggs} ${ColinIhrig} ${DanielleAdams} ${JamesMSnell} ${MichaelZasso} ${MylesBorins} ${RichardLau} ${RodVagg} ${RubenBridgewater} ${RuyAdorno} ${ShelleyVohr}"
+keylist="${EvanLucas} ${GibsonFahnestock} ${JeremiahSenkpiel} ${ChrisDickinson} ${IsaacZSchlueter} ${ItaloACasas} ${JulienGilli} ${TimothyJFontaine} ${BethGriggs} ${ColinIhrig} ${PrevDanielleAdams} ${DanielleAdams} ${JamesMSnell} ${MichaelZasso} ${MylesBorins} ${RichardLau} ${RodVagg} ${RubenBridgewater} ${RuyAdorno} ${ShelleyVohr}"
 
 for key in ${keylist} ; do
   gpg2 --keyserver pool.sks-keyservers.net --recv-keys ${key}