diff --git a/factory/.env b/factory/.env index b9f9b04621..cbbf55e373 100644 --- a/factory/.env +++ b/factory/.env @@ -21,13 +21,13 @@ NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}" FACTORY_VERSION='5.1.0' # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable -CHROME_VERSION='131.0.6778.69-1' +CHROME_VERSION='131.0.6778.85-1' # Cypress versions: https://www.npmjs.com/package/cypress CYPRESS_VERSION='13.16.0' # Edge versions: https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/ -EDGE_VERSION='131.0.2903.51-1' +EDGE_VERSION='131.0.2903.70-1' # Firefox versions: https://download-installer.cdn.mozilla.net/pub/firefox/releases/ FIREFOX_VERSION='132.0.2' @@ -40,9 +40,12 @@ YARN_VERSION='1.22.22' # TODO: Globally installed webkit currently isn't found, see issue https://github.com/cypress-io/cypress/issues/25344 # WEBKIT_VERSION='1.29.0' -# Tags used for the Docker images generated from cypress/factory. Keep in mind the Docker images will only release if these versions change. +# Tags used for the Docker images generated from cypress/factory. +# A change to BASE_IMAGE_TAG, BROWSERS_IMAGE_TAG or INCLUDED_IMAGE_TAG causes a corresponding new image to be deployed. +# The short-form convenience tags, BROWSERS_IMAGE_SHORT_TAG and INCLUDED_IMAGE_SHORT_TAG, are not used in determining whether to deploy a new image. BASE_IMAGE_TAG="${NODE_VERSION}" +BROWSERS_IMAGE_SHORT_TAG="${NODE_VERSION}" BROWSERS_IMAGE_TAG="node-${NODE_VERSION}-chrome-${CHROME_VERSION}-ff-${FIREFOX_VERSION}-edge-${EDGE_VERSION}" INCLUDED_IMAGE_SHORT_TAG="${CYPRESS_VERSION}" diff --git a/factory/docker-compose.yml b/factory/docker-compose.yml index a29658ce39..4f73a2a101 100644 --- a/factory/docker-compose.yml +++ b/factory/docker-compose.yml @@ -55,6 +55,7 @@ services: EDGE_VERSION: ${EDGE_VERSION} tags: - ${REPO_PREFIX-}cypress/browsers:latest # comment out for release of alternate version + - ${REPO_PREFIX-}cypress/browsers:${BROWSERS_IMAGE_SHORT_TAG} - ${REPO_PREFIX-}cypress/browsers:${BROWSERS_IMAGE_TAG} command: node -v