Fix conflict between elasticsearch and opensearch docker CI tasks (#185)

PHP-CMSIG · May 11, 2023 · ed16c07 · ed16c07
1 parent 44a42a1
commit ed16c07
Show file tree

Hide file tree

Showing 32 changed files with 1,103 additions and 1,075 deletions.
diff --git a/.examples/laravel/composer.lock b/.examples/laravel/composer.lock
diff --git a/.examples/laravel/docker-compose.yml b/.examples/laravel/docker-compose.yml
@@ -1,13 +1,12 @@
 services:
   elasticsearch:
-    image: elasticsearch:8.5.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.7.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: 'false'
       cluster.routing.allocation.disk.threshold_enabled: 'false'
     ports:
       - "9200:9200"
-      - "9600:9600"
     healthcheck:
       test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
       interval: 5s
@@ -39,7 +38,6 @@ services:
       http.port: 9201
     ports:
       - "9201:9201"
-      - "9601:9600"
     healthcheck:
       test: ["CMD-SHELL", "curl --silent --fail localhost:9201/_cluster/health || exit 1"]
       interval: 5s

diff --git a/.examples/mezzio/composer.lock b/.examples/mezzio/composer.lock
diff --git a/.examples/mezzio/docker-compose.yml b/.examples/mezzio/docker-compose.yml
@@ -1,13 +1,12 @@
 services:
   elasticsearch:
-    image: elasticsearch:8.5.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.7.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: 'false'
       cluster.routing.allocation.disk.threshold_enabled: 'false'
     ports:
       - "9200:9200"
-      - "9600:9600"
     healthcheck:
       test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
       interval: 5s
@@ -39,7 +38,6 @@ services:
       http.port: 9201
     ports:
       - "9201:9201"
-      - "9601:9600"
     healthcheck:
       test: ["CMD-SHELL", "curl --silent --fail localhost:9201/_cluster/health || exit 1"]
       interval: 5s

diff --git a/.examples/spiral/composer.json b/.examples/spiral/composer.json
@@ -12,7 +12,7 @@
         "php": ">=8.1",
         "ext-sockets": "*",
         "spiral/roadrunner-cli": "^2.4",
-        "spiral/framework": "^3.6",
+        "spiral/framework": "^3.7",
         "ext-mbstring": "*",
         "spiral/nyholm-bridge": "^1.3",
         "spiral-packages/yii-error-handler-bridge": "^1.0",