Merge remote-tracking branch 'origin/master' into jpa-docker-deprecation

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2024-06-21
+### Added
+- Added warning for usage of legacy docker-compose v1.
+
+  docker-compose v1 has reached its End Of Life in July 2023 (https://docs.docker.com/compose/migrate/).
+  Support for docker-compose v1 in the Overleaf Toolkit will be dropped with the release of Server Pro 5.2.
+  We recommend upgrading to Docker Compose v2 before then.
+
 ## 2024-06-20
 ### Added
 - Updated default [`version`](https://github.com/overleaf/toolkit/blob/master/lib/config-seed/version) to `5.0.6`.

bin/docker-compose

@@ -199,6 +199,7 @@ function docker_compose() {
     exec docker compose "${flags[@]}"
   elif command -v docker-compose >/dev/null; then
     # Fall back to docker-compose v1
+    echo "WARNING: docker-compose v1 has reached its End Of Life in July 2023 (https://docs.docker.com/compose/migrate/). Support for docker-compose v1 in the Overleaf Toolkit will be dropped with the release of Server Pro 5.2. We recommend upgrading to Docker Compose v2 before then." >&2
     exec docker-compose "${flags[@]}"
   else
     echo "ERROR: Could not find Docker Compose." >&2

bin/doctor

@@ -130,6 +130,7 @@ function check_dependencies() {
     print_point 2 "status: present"
     print_point 2 "version info: $(docker compose version)"
   elif command -v docker-compose > /dev/null; then
+    add_warning "docker-compose v1 has reached its End Of Life in July 2023 (https://docs.docker.com/compose/migrate/). Support for docker-compose v1 in the Overleaf Toolkit will be dropped with the release of Server Pro 5.2. We recommend upgrading to Docker Compose v2 before then."
     check_for_binary docker-compose
   else
     add_warning "Docker Compose not found"