diff --git a/circle.yml b/circle.yml index 319ddb8f74..9ac6871649 100644 --- a/circle.yml +++ b/circle.yml @@ -124,8 +124,8 @@ jobs: name: check git version command: | ACTUAL_VERSION=$(docker compose run test-factory-all-included git --version) - if [ "git version 2.30.2" != "${ACTUAL_VERSION}" ]; then - echo "Version mismatch, git package version: git version 2.30.2 != ${ACTUAL_VERSION}" + if [ "git version 2.39.2" != "${ACTUAL_VERSION}" ]; then + echo "Version mismatch, git package version: git version 2.39.2 != ${ACTUAL_VERSION}" exit 1; fi echo "Version ${ACTUAL_VERSION} confirmed" diff --git a/factory/.env b/factory/.env index 6c54def1c9..30d7d38b48 100644 --- a/factory/.env +++ b/factory/.env @@ -5,7 +5,7 @@ ## to setup a one off branch and create at a PR to it to release resulting images. # The debian image the factory is based on -BASE_IMAGE='debian:bullseye-slim' +BASE_IMAGE='debian:12-slim' # Node Versions: https://nodejs.org/en/download/releases/ FACTORY_DEFAULT_NODE_VERSION='20.13.1' @@ -14,7 +14,7 @@ FACTORY_DEFAULT_NODE_VERSION='20.13.1' 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='3.5.7' +FACTORY_VERSION='4.0.0' # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable CHROME_VERSION='125.0.6422.60-1' diff --git a/factory/CHANGELOG.md b/factory/CHANGELOG.md index 0a9b76ba70..fba7330059 100644 --- a/factory/CHANGELOG.md +++ b/factory/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 4.0.0 + +* Updated Debian base image to `debian:12-slim` (codename `bookworm`). Addressed in [#1057](https://github.com/cypress-io/cypress-docker-images/pull/1057) + ## 3.5.7 * Updated Yarn (v1 Classic) version from `1.22.19` to `1.22.22`. Addressed in [#1071](https://github.com/cypress-io/cypress-docker-images/pull/1071)