diff --git a/.github/workflows/api-spec.yml b/.github/workflows/api-spec.yml index b53a1d8..93e3072 100644 --- a/.github/workflows/api-spec.yml +++ b/.github/workflows/api-spec.yml @@ -38,7 +38,7 @@ jobs: run: | docker network create frontend # The spec export only needs PHP — pull phpfpm alone and run it as a - # one-off (--no-deps skips mariadb/rabbit), not the whole stack. + # one-off (--no-deps skips mariadb), not the whole stack. docker compose pull --quiet phpfpm docker compose run --rm --no-deps phpfpm composer install --no-interaction diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b43bd59..16e48a2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -23,8 +23,8 @@ jobs: - name: Start docker compose setup and install site run: | docker network create frontend - # API tests need PHP + Elasticsearch only (not mariadb/rabbit/nginx/mail); - # --no-deps keeps phpfpm's mariadb/rabbit dependencies from starting. + # API tests need PHP + Elasticsearch only (not mariadb/nginx/mail); + # --no-deps keeps phpfpm's mariadb dependency from starting. docker compose pull --quiet phpfpm elasticsearch docker compose up --detach --wait --no-deps phpfpm elasticsearch docker compose exec -T phpfpm composer install --no-interaction diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e7cd97..4581655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log. ## [Unreleased] +- [PR-72](https://github.com/itk-dev/event-database-api/pull/72) + Update Elasticsearch to 8.19.23 and remove the unused RabbitMQ service - [PR-71](https://github.com/itk-dev/event-database-api/pull/71) Require PHP 8.5 and apply the Rector PHP 8.5 rules diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 9928b01..b61c9dc 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,21 +2,6 @@ services: phpfpm: networks: - frontend - depends_on: - # - elasticsearch - - rabbit - - rabbit: - image: rabbitmq:3.12.4-management-alpine - networks: - - app - - frontend - ports: - - "15672" - environment: - - RABBITMQ_DEFAULT_USER=user - - RABBITMQ_DEFAULT_PASS=password - - RABBITMQ_ERLANG_COOKIE='d53f319cd7376f8f840aaf9889f315ab nginx: environment: @@ -32,7 +17,7 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_DOMAIN}`) && (PathPrefix(`${APP_PATH_PREFIX}`) || PathPrefix(`/_wdt`) || PathPrefix(`/_profiler`))" elasticsearch: - image: elasticsearch:8.19.18 + image: elasticsearch:8.19.23 networks: - app - frontend