[pull] master from cypress-io:master

factory/.env

@@ -8,19 +8,19 @@
 BASE_IMAGE='debian:bullseye-slim'
 
 # Node Versions: https://nodejs.org/en/download/releases/
-FACTORY_DEFAULT_NODE_VERSION='18.16.0'
+FACTORY_DEFAULT_NODE_VERSION='20.5.0'
 
 # Node Versions: https://nodejs.org/en/download/releases/
 NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}"
 
 # Update this to deploy the docker factory if you make changes to factory.Dockerfile or install scripts
-FACTORY_VERSION='2.3.0'
+FACTORY_VERSION='3.0.0'
 
 # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
 CHROME_VERSION='114.0.5735.133-1'
 
 # Cypress versions: https://www.npmjs.com/package/cypress
-CYPRESS_VERSION='12.17.2'
+CYPRESS_VERSION='12.17.3'
 
 # Edge versions: https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/
 EDGE_VERSION='114.0.1823.51-1'

factory/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## 3.0.0
+
+* Updated default node version from `18.16.1` to `20.5.0`. Addressed in [#920](https://github.com/cypress-io/cypress-docker-images/pull/920)
+
+* Added `openssl` and `ca-certificates` to factory. Addressed in [#920](https://github.com/cypress-io/cypress-docker-images/pull/920)
+
+
+## 2.4.0
+
+* Updated default node version from `18.16.0` to `18.16.1`. Addressed in [#906](https://github.com/cypress-io/cypress-docker-images/pull/906)
 ## 2.3.0
 
 * Updated default node version from `18.15.0` to `18.16.0`. Addressed in [#881](https://github.com/cypress-io/cypress-docker-images/pull/881)

factory/factory.Dockerfile

@@ -52,6 +52,9 @@ RUN ls -la /root \
     openssh-client\
     # Chrome and Edge require wget even after installation. We could do more work to dynamically remove it, but I doubt it's worth it.
     wget \
+    # Needed to make https calls from the docker container
+    openssl \
+    ca-certificates \
     # build only dependancies: removed in onbuild step
     bzip2 \
     gnupg \

factory/installScripts/edge/default.sh

@@ -1,10 +1,7 @@
 #! /bin/bash
 
 # Microsoft offers a debian package, here we're adding the package list and then installing the specific version we want to install.
-apt-get update \
-  && apt-get install --no-install-recommends -y \
-    ca-certificates \
-  && curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
+curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
   && install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d \
   && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-stable.list' \
   && rm microsoft.gpg \

factory/installScripts/node/default.sh

@@ -16,7 +16,7 @@ ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     esac \
     && set -ex \
     && savedAptMark="$(apt-mark showmanual)" \
-    && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
+    && apt-get update && apt-get install -y curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && for key in \
       4ED778F539E3634C779C87C6D7062848A1AB005C \