Merge branch 'master' into v4.x

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.3.0, 3.2.3, 3.1.4, 3.0.6]
+        ruby-version: [3.3.4, 3.2.5, 3.1.6]
         redis-version: [4, 5]
 
     steps:

README.md

@@ -149,18 +149,18 @@ In addition, beetle ships with a cucumber feature to test the automatic redis fa
 an integration test. For this you need a recent Go installation in order to compile the
 beetle go binary. Just invoke `make` in the top level directory.
 
-There are two ways to start the required test dependencies: using `docker-compose` or
+There are two ways to start the required test dependencies: using `docker compose` or
 starting the services manually.
 
-### Testing with docker-compose
+### Testing with docker compose
 
 Open a separate terminal window and run
 
-     docker-compose pull
+     docker compose pull
 
 followed by
 
-     docker-compose up
+     docker compose up
 
 This will start mysql, two redis servers, two RabbitMQ instances and a single consul
 development node.

docker-compose-smoke-test.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   redis1:
     container_name: beetle-redis1

docker-compose-smoke2-test.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   redis1:
     container_name: beetle-redis1

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   mysql:
     container_name: beetle-mysql

script/smoke

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec docker-compose -f docker-compose-smoke-test.yml $@
+exec docker compose -f docker-compose-smoke-test.yml $@

script/smoke2

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec docker-compose -f docker-compose-smoke2-test.yml $@
+exec docker compose -f docker-compose-smoke2-test.yml $@