diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ca902b1..907d9990 100644 --- a/.github/workflows/build.yml +++ b/.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: diff --git a/README.md b/README.md index bc360e92..7b576e33 100644 --- a/README.md +++ b/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. diff --git a/docker-compose-smoke-test.yml b/docker-compose-smoke-test.yml index 20d8c01a..45bc9e32 100644 --- a/docker-compose-smoke-test.yml +++ b/docker-compose-smoke-test.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis1: container_name: beetle-redis1 diff --git a/docker-compose-smoke2-test.yml b/docker-compose-smoke2-test.yml index 49267d27..66092580 100644 --- a/docker-compose-smoke2-test.yml +++ b/docker-compose-smoke2-test.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis1: container_name: beetle-redis1 diff --git a/docker-compose.yml b/docker-compose.yml index 2d38ce92..ac2425a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2' - services: mysql: container_name: beetle-mysql diff --git a/script/smoke b/script/smoke index b33d514d..b92b67f4 100755 --- a/script/smoke +++ b/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 $@ diff --git a/script/smoke2 b/script/smoke2 index 63fcdf60..0318c923 100755 --- a/script/smoke2 +++ b/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 $@