fix: use microsoft-edge.list for Edge installation (#1406)

* fix(microsoft-edge): use same apt source filename as Microsoft post-install script

* fix: use microsoft-edge.list for Edge installation

* Update Chrome browsers

CHROME_VERSION to 140.0.7339.80-1
CHROME_FOR_TESTING_VERSION to 140.0.7339.80

* update Edge to 140.0.3485.54-1

---------

Co-authored-by: Marco Reyes R <[email protected]>

Author: MikeMcC399

factory/.env

@@ -18,23 +18,23 @@ 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='6.0.1'
+FACTORY_VERSION='6.0.2'
 
 # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
 # Linux/amd64 only
-CHROME_VERSION='139.0.7258.154-1'
+CHROME_VERSION='140.0.7339.80-1'
 
 # Chrome for Testing versions: https://googlechromelabs.github.io/chrome-for-testing/
 # not currently used for cypress/browsers and cypress/included images
 # Linux/amd64 only
-CHROME_FOR_TESTING_VERSION='139.0.7258.154'
+CHROME_FOR_TESTING_VERSION='140.0.7339.80'
 
 # Cypress versions: https://www.npmjs.com/package/cypress
 CYPRESS_VERSION='15.1.0'
 
 # Edge versions: https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/
 # Linux/amd64 only
-EDGE_VERSION='139.0.3405.125-1'
+EDGE_VERSION='140.0.3485.54-1'
 
 # Firefox versions: https://download-installer.cdn.mozilla.net/pub/firefox/releases/
 # Linux/amd64 for all versions, Linux/arm64 for versions 136.0 and above

factory/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 6.0.2
+
+- When installing Microsoft Edge, use only `/etc/apt/sources.list.d/microsoft-edge.list` to resolve a multiple configuration warning from Debian package management. Addresses [#1404](https://github.com/cypress-io/cypress-docker-images/issues/1404).
+
 ## 6.0.1
 
 - Updated `FACTORY_DEFAULT_NODE_VERSION` from `22.18.0` to `22.19.0`. Addressed in [#1408](https://github.com/cypress-io/cypress-docker-images/pull/1408).

factory/installScripts/edge/default.sh

@@ -3,7 +3,7 @@
 # Microsoft offers a debian package, here we're adding the package list and then installing the specific version we want to install.
 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' \
+  && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge.list' \
   && rm microsoft.gpg \
   && apt-get update \
   && apt-get install -y microsoft-edge-stable=${1} \