diff --git a/build.xml b/build.xml index 03a514f6a17..7b23ac0ccb5 100644 --- a/build.xml +++ b/build.xml @@ -30,6 +30,7 @@ + diff --git a/microservices/product-search-export/docker/Dockerfile b/microservices/product-search-export/docker/Dockerfile index 8045369e9e9..216b347e575 100644 --- a/microservices/product-search-export/docker/Dockerfile +++ b/microservices/product-search-export/docker/Dockerfile @@ -223,7 +223,7 @@ RUN composer global require hirak/prestissimo # copy source code to the container COPY --chown=www-data:www-data / /var/www/html -RUN composer install -o --no-dev +RUN composer install -o --no-dev --ignore-platform-reqs ######################################################################################################################## diff --git a/microservices/product-search-export/docker/docker-cmd-development b/microservices/product-search-export/docker/docker-cmd-development index f7a477a49c3..166262c22e9 100755 --- a/microservices/product-search-export/docker/docker-cmd-development +++ b/microservices/product-search-export/docker/docker-cmd-development @@ -4,10 +4,10 @@ # avoids the need to install them manually when using a mounted volume if composer validate --no-check-all --no-check-publish; then echo "The lock file is valid, installing dependencies..." - composer install + composer install --ignore-platform-reqs else echo "The lock file is invalid, updating dependencies..." - composer update + composer update --ignore-platform-reqs fi # warm up the Symfony cache diff --git a/microservices/product-search/docker/Dockerfile b/microservices/product-search/docker/Dockerfile index 8045369e9e9..216b347e575 100644 --- a/microservices/product-search/docker/Dockerfile +++ b/microservices/product-search/docker/Dockerfile @@ -223,7 +223,7 @@ RUN composer global require hirak/prestissimo # copy source code to the container COPY --chown=www-data:www-data / /var/www/html -RUN composer install -o --no-dev +RUN composer install -o --no-dev --ignore-platform-reqs ######################################################################################################################## diff --git a/microservices/product-search/docker/docker-cmd-development b/microservices/product-search/docker/docker-cmd-development index f7a477a49c3..166262c22e9 100755 --- a/microservices/product-search/docker/docker-cmd-development +++ b/microservices/product-search/docker/docker-cmd-development @@ -4,10 +4,10 @@ # avoids the need to install them manually when using a mounted volume if composer validate --no-check-all --no-check-publish; then echo "The lock file is valid, installing dependencies..." - composer install + composer install --ignore-platform-reqs else echo "The lock file is invalid, updating dependencies..." - composer update + composer update --ignore-platform-reqs fi # warm up the Symfony cache diff --git a/project-base/build-dev.xml b/project-base/build-dev.xml index 05c8b6d2478..cbcd4e57c02 100644 --- a/project-base/build-dev.xml +++ b/project-base/build-dev.xml @@ -43,6 +43,7 @@ checkreturn="true" > + diff --git a/project-base/build.xml b/project-base/build.xml index 9934344fbb3..6d39f6012b9 100644 --- a/project-base/build.xml +++ b/project-base/build.xml @@ -109,6 +109,7 @@ > + diff --git a/project-base/docker/php-fpm/Dockerfile b/project-base/docker/php-fpm/Dockerfile index 0dbcd1f948c..a80864f5804 100644 --- a/project-base/docker/php-fpm/Dockerfile +++ b/project-base/docker/php-fpm/Dockerfile @@ -100,7 +100,7 @@ FROM base as production COPY --chown=www-data:www-data / /var/www/html -RUN composer install --optimize-autoloader --no-interaction --no-progress --no-dev +RUN composer install --optimize-autoloader --no-interaction --no-progress --no-dev --ignore-platform-reqs RUN php phing composer npm dirs-create assets @@ -110,7 +110,7 @@ FROM base as ci COPY --chown=www-data:www-data / /var/www/html -RUN composer install --optimize-autoloader --no-interaction --no-progress --dev +RUN composer install --optimize-autoloader --no-interaction --no-progress --dev --ignore-platform-reqs RUN php phing composer-dev npm dirs-create test-dirs-create assets standards tests-static tests-acceptance-build