Merge branch 'master' into msm-overleaf-rc-rebrand

CHANGELOG.md

@@ -8,6 +8,11 @@
 
 - Rebranded 'SHARELATEX_' variables to 'OVERLEAF_'
 
+## 2024-02-16
+### Added
+- Updated default [`version`](https://github.com/overleaf/toolkit/blob/master/lib/config-seed/version) to `4.2.3`.
+
+  :warning: This is a security release. Please check the [release notes](https://github.com/overleaf/overleaf/wiki/Release-Notes--4.x.x#server-pro-423) for details.
 
 ## 2024-02-14
 ### Added

bin/upgrade

@@ -125,6 +125,18 @@ function handle_image_upgrade() {
 
   echo "Upgrading config/version from $IMAGE_VERSION to $SEED_IMAGE_VERSION"
 
+  local docker_compose_override_path="$TOOLKIT_ROOT/config/docker-compose.override.yml"
+  if [ -f "$docker_compose_override_path" ]; then
+     if grep -q -E '^\s*image: sharelatex/sharelatex.*' "$docker_compose_override_path"; then
+        echo "WARNING: you are using a customized docker image, the server may not run on the latest version post upgrade."
+        echo "* If you have followed the guide 'Upgrading TexLive', please remove and recreate the modified image."
+        echo "* Remove the image: 'docker rm sharelatex/sharelatex:with-texlive-full'"
+        echo "* Remove the override file: 'rm config/docker-compose.override.yml'"
+        echo "* Recreate the image by following: https://github.com/overleaf/toolkit/blob/master/doc/ce-upgrading-texlive.md"
+     fi
+  fi
+
+
   ## Offer to stop docker services
   local services_stopped="false"
   if services_up; then