Merge remote-tracking branch 'elasticsearch-php/7.x'

Author: ezimuel

.ci/Dockerfile

@@ -1,7 +1,6 @@
 ARG PHP_VERSION=7.4-cli
 FROM php:${PHP_VERSION}
 
-# Create app directory
 WORKDIR /usr/src/app
 
 # Install git
@@ -14,8 +13,23 @@ RUN apt-get install -y \
         zip \
     && docker-php-ext-install zip
 
+# Print PHP version
+RUN php -v
+
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Install prestissimo pluing for composer
-RUN composer global require hirak/prestissimo
+# Print composer version
+RUN composer --version
+
+COPY composer.json .
+
+# Install dependencies with composer
+RUN composer global require hirak/prestissimo && composer install
+
+COPY . .
+
+# Updating elasticsearch submodule
+RUN git submodule update --init --recursive
+
+CMD ["bash", ".ci/yaml-tests.sh"]

.ci/run-repository.sh

@@ -22,6 +22,7 @@ echo -e "\033[34;1mINFO:\033[0m PHP_VERSION ${PHP_VERSION}\033[0m"
 echo -e "\033[1m>>>>> Build docker container >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
 docker build \
+  --no-cache \
   --file .ci/Dockerfile \
   --tag elastic/elasticsearch-php \
   --build-arg PHP_VERSION=${PHP_VERSION} \
@@ -33,13 +34,12 @@ repo=$(realpath $(dirname $(realpath -s $0))/../)
 
 docker run \
   --network=${network_name} \
-  --volume $repo:/usr/src/app \
+  --workdir="/usr/src/app" \
   --env STACK_VERSION=${STACK_VERSION} \
   --env TEST_SUITE=${TEST_SUITE} \
   --env PHP_VERSION=${PHP_VERSION} \
   --env ELASTICSEARCH_URL=${ELASTICSEARCH_URL} \
   --ulimit nofile=65535:65535 \
   --name elasticsearch-php \
   --rm \
-  elastic/elasticsearch-php 
-  $script_path/run-yaml-tests.sh
+  elastic/elasticsearch-php

.ci/run-tests

@@ -20,4 +20,4 @@ if [[ -n "$RUNSCRIPTS" ]]; then
 fi
 
 echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
-bash .ci/run-repository.sh
+bash .ci/run-repository.sh

.ci/test-matrix.yml

@@ -1,6 +1,6 @@
 ---
 STACK_VERSION:
-  - 8.0.0-SNAPSHOT
+  - 7.6-SNAPSHOT
 
 PHP_VERSION:
   - 7.4-cli

.ci/run-yaml-tests.sh renamed to .ci/yaml-tests.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-composer install
-git submodule update --init --recursive
+# Checkout the YAML test from Elasticsearch tag
 php util/RestSpecRunner.php
+
+# Run YAML tests
 vendor/bin/phpunit -c phpunit-integration.xml --group sync