diff --git a/factory/.env b/factory/.env index e100d1bda4..602e5a7ff2 100644 --- a/factory/.env +++ b/factory/.env @@ -18,7 +18,7 @@ NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}" # Update the FACTORY_VERSION to deploy cypress/factory if you make changes to # BASE_IMAGE, FACTORY_DEFAULT_NODE_VERSION, YARN_VERSION, factory.Dockerfile or installScripts -FACTORY_VERSION='5.11.4' +FACTORY_VERSION='5.11.5' # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable # Linux/amd64 only diff --git a/factory/CHANGELOG.md b/factory/CHANGELOG.md index afb162b5dc..005fc8fe4f 100644 --- a/factory/CHANGELOG.md +++ b/factory/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 5.11.5 + +- When importing PGP keys for Node.js, allow individual key imports to fail. Log an error and continue to build. Resolves an issue when there is a network connectivity problem to the fallback keyserver keyserver.ubuntu.com. Addressed in [#1385](https://github.com/cypress-io/cypress-docker-images/issues/1385). + ## 5.11.4 - Updated default node version from `22.17.0` to `22.17.1`. Addressed in [#1384](https://github.com/cypress-io/cypress-docker-images/pull/1384). diff --git a/factory/installScripts/node/default.sh b/factory/installScripts/node/default.sh index f6105bcf1a..533176c90c 100755 --- a/factory/installScripts/node/default.sh +++ b/factory/installScripts/node/default.sh @@ -37,7 +37,8 @@ ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ ; do \ { gpg --batch --keyserver hkps://keys.openpgp.org $keyserverOptions --recv-keys "$key" && gpg --batch --fingerprint "$key" ; } || - { gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key" ; } ; \ + { gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && gpg --batch --fingerprint "$key" ; } || + { echo failed to import Node.js release key "$key" ; } ; \ done \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$1/node-v$1-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$1/SHASUMS256.txt.asc" \