Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion factory/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions factory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
3 changes: 2 additions & 1 deletion factory/installScripts/node/default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down