feat: add geckodriver to cypress/browsers and cypress/included

Author: MikeMcC399

README.md

@@ -52,6 +52,12 @@ Cypress officially [supports][Cypress Browser Support] the latest 3 major versio
 [Chromium]: https://www.chromium.org/Home/
 [Cypress Browser Support]: https://docs.cypress.io/app/references/launching-browsers#Browser-versions-supported
 
+### Mozilla geckodriver
+
+[cypress/browsers](./browsers/) and [cypress/included](./included/) images with Firefox `139.0` and above are built with the [Mozilla geckodriver](https://github.com/mozilla/geckodriver) included. This driver is needed to test when using Firefox with Cypress versions >= [13.15.1](https://docs.cypress.io/app/references/changelog#13-15-1). The environment variable `GECKODRIVER_PATH` points to the driver located at `/opt/geckodriver/geckodriver`. Earlier images, that do not include the driver, may attempt to download the driver at run-time when testing Firefox, causing failures in air-gapped network environments with no Internet access.
+
+[cypress/factory](./factory/) provides the parameter [GECKODRIVER_VERSION](./factory/README.md#geckodriver_version) to optionally add the driver to a custom image.
+
 ### Debian packages
 
 [Debian][Debian packages] provides two Cypress-compatible browsers as packages covering both `amd64` and `arm64` architectures.

circle.yml

@@ -260,7 +260,6 @@ workflows:
                   test-factory-cypress-included-electron,
                   test-factory-cypress-included-electron-non-root-user,
                   test-factory-cypress-included-firefox,
-                  test-factory-cypress-included-firefox-geckodriver,
                   test-factory-cypress-included-firefox-non-root-user,
                   test-factory-all-included-electron-only,
                 ]
@@ -281,7 +280,6 @@ workflows:
                   test-factory-cypress-included-electron-non-root-user,
                   test-factory-cypress-included-chrome,
                   test-factory-cypress-included-firefox,
-                  test-factory-cypress-included-firefox-geckodriver,
                   test-factory-cypress-included-firefox-non-root-user,
                   test-factory-cypress-included-edge,
                   test-factory-all-included,

factory/.env

@@ -33,7 +33,7 @@ EDGE_VERSION='136.0.3240.76-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
-FIREFOX_VERSION='138.0.4'
+FIREFOX_VERSION='139.0'
 
 # Geckodriver versions: https://github.com/mozilla/geckodriver/releases
 # Geckodriver documentation: https://firefox-source-docs.mozilla.org/testing/geckodriver/index.html

factory/docker-compose.yml

@@ -32,6 +32,7 @@ services:
         CYPRESS_VERSION: ${CYPRESS_VERSION}
         EDGE_VERSION: ${EDGE_VERSION}
         FIREFOX_VERSION: ${FIREFOX_VERSION}
+        GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
         YARN_VERSION: ${YARN_VERSION}
         # WEBKIT_VERSION: ${WEBKIT_VERSION}
       tags:
@@ -51,6 +52,7 @@ services:
         YARN_VERSION: ${YARN_VERSION}
         CHROME_VERSION: ${CHROME_VERSION}
         FIREFOX_VERSION: ${FIREFOX_VERSION}
+        GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
         EDGE_VERSION: ${EDGE_VERSION}
       tags:
         - ${REPO_PREFIX-}cypress/browsers:latest # comment out for release of alternate version
@@ -101,19 +103,6 @@ services:
 
   firefox:
     image: ${REPO_PREFIX-}cypress/firefox
-    build:
-      target: default_image
-      context: .
-      args:
-        NODE_VERSION: ${NODE_VERSION}
-        FACTORY_VERSION: ${FACTORY_VERSION}
-        FIREFOX_VERSION: ${FIREFOX_VERSION}
-      tags:
-        - ${REPO_PREFIX-}cypress/firefox:${FIREFOX_VERSION}
-    command: firefox --version
-
-  firefox-geckodriver:
-    image: ${REPO_PREFIX-}cypress/firefox-geckodriver
     build:
       target: default_image
       context: .
@@ -123,7 +112,7 @@ services:
         FIREFOX_VERSION: ${FIREFOX_VERSION}
         GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
       tags:
-        - ${REPO_PREFIX-}cypress/firefox-geckodriver:${FIREFOX_VERSION}-${GECKODRIVER_VERSION}
+        - ${REPO_PREFIX-}cypress/firefox:${FIREFOX_VERSION}
     command: firefox --version
 
   # webkit:
@@ -181,20 +170,6 @@ services:
 
   cypress-firefox:
     image: ${REPO_PREFIX-}cypress/cypress-firefox
-    build:
-      target: default_image
-      context: .
-      args:
-        NODE_VERSION: ${NODE_VERSION}
-        FACTORY_VERSION: ${FACTORY_VERSION}
-        CYPRESS_VERSION: ${CYPRESS_VERSION}
-        FIREFOX_VERSION: ${FIREFOX_VERSION}
-      tags:
-        - ${REPO_PREFIX-}cypress/cypress-firefox:cypress-${CYPRESS_VERSION}-firefox-${FIREFOX_VERSION}
-    command: node -v
-
-  cypress-firefox-geckodriver:
-    image: ${REPO_PREFIX-}cypress/cypress-firefox-geckodriver
     build:
       target: default_image
       context: .
@@ -205,7 +180,7 @@ services:
         FIREFOX_VERSION: ${FIREFOX_VERSION}
         GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
       tags:
-        - ${REPO_PREFIX-}cypress/cypress-firefox:cypress-${CYPRESS_VERSION}-firefox-${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}
+        - ${REPO_PREFIX-}cypress/cypress-firefox:cypress-${CYPRESS_VERSION}-firefox-${FIREFOX_VERSION}
     command: node -v
 
   ## Test image

factory/test-project/docker-compose.yml

@@ -40,15 +40,6 @@ services:
     command: npm run test -- -b chrome
 
   test-factory-firefox:
-    build:
-      args:
-        NODE_VERSION: ${NODE_VERSION}
-        FIREFOX_VERSION: ${FIREFOX_VERSION}
-        BASE_TEST_IMAGE: cypress/factory:${FACTORY_VERSION}
-      context: .
-    command: npm run test -- -b firefox
-
-  test-factory-firefox-geckodriver:
     build:
       args:
         NODE_VERSION: ${NODE_VERSION}
@@ -100,17 +91,6 @@ services:
     command: cypress run -b chrome
 
   test-factory-cypress-included-firefox:
-    build:
-      args:
-        NODE_VERSION: ${NODE_VERSION}
-        CYPRESS_VERSION: ${CYPRESS_VERSION}
-        FIREFOX_VERSION: ${FIREFOX_VERSION}
-        BASE_TEST_IMAGE: cypress/factory:${FACTORY_VERSION}
-      dockerfile: included.Dockerfile
-      context: .
-    command: cypress run -b firefox
-
-  test-factory-cypress-included-firefox-geckodriver:
     build:
       args:
         NODE_VERSION: ${NODE_VERSION}
@@ -129,6 +109,7 @@ services:
         NODE_VERSION: ${NODE_VERSION}
         CYPRESS_VERSION: ${CYPRESS_VERSION}
         FIREFOX_VERSION: ${FIREFOX_VERSION}
+        GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
         BASE_TEST_IMAGE: cypress/factory:${FACTORY_VERSION}
       dockerfile: included-non-root-user.Dockerfile
       context: .
@@ -162,6 +143,7 @@ services:
         CYPRESS_VERSION: ${CYPRESS_VERSION}
         CHROME_VERSION: ${CHROME_VERSION}
         FIREFOX_VERSION: ${FIREFOX_VERSION}
+        GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
         EDGE_VERSION: ${EDGE_VERSION}
         BASE_TEST_IMAGE: cypress/factory:${FACTORY_VERSION}
       dockerfile: included.Dockerfile
@@ -176,6 +158,7 @@ services:
         CYPRESS_VERSION: ${CYPRESS_VERSION}
         CHROME_VERSION: ${CHROME_VERSION}
         FIREFOX_VERSION: ${FIREFOX_VERSION}
+        GECKODRIVER_VERSION: ${GECKODRIVER_VERSION}
         EDGE_VERSION: ${EDGE_VERSION}
         BASE_TEST_IMAGE: cypress/factory:${FACTORY_VERSION}
       dockerfile: included.Dockerfile