diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40078eb7fb9be0c438b3c82750326fe740db427c..9916f221c66194f985ae8987d26f4d025cbe9251 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,9 +34,6 @@ job_e2e: image: php:7.4-apache stage: test script: - - sed -i -e "s/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE \& ~E_DEPRECATED \& ~E_STRICT/g" /etc/php.ini \ - - sed -i -e "s/display_errors = Off/display_errors = On/g" /etc/php.ini \ - - sed -i -e "s/short_open_tag = Off/short_open_tag = On/g" /etc/php.ini - service apache2 start - mkdir -p /opt/maarch/docservers/indexes/{letterbox_coll,attachments_coll,version_attachments_coll} - mkdir -p /opt/maarch/docservers/{ai,manual,manual_attachments,templates,acknowledgement_receipts} diff --git a/ci/docker_install_php.sh b/ci/docker_install_php.sh index 90f9dd8d8106b2e6d639ed92c12b9f902a1eaafc..8a083ee42f3c8025af3a14cb13e71b0860e86a90 100755 --- a/ci/docker_install_php.sh +++ b/ci/docker_install_php.sh @@ -31,5 +31,4 @@ apt-get install -y libpq-dev libxml2-dev libxslt1-dev libpng-dev unoconv xpdf-ut && echo "Require all granted" >> directory.txt \ && echo "</Directory>" >> directory.txt \ && sed -i -e '/CustomLog/r directory.txt' /etc/apache2/sites-available/000-default.conf \ -&& cp ci/php.ini /usr/local/etc/php/conf.d/php.ini \ -&& cp ci/php.ini /usr/local/etc/php/php.ini +&& cp ci/php.ini /usr/local/etc/php/conf.d/php.ini