From cff797cc194915ab805013c3eb3204a8b016a1e6 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 28 Apr 2020 17:47:39 +0100
Subject: [PATCH] FIX #11895 Test E2E
---
.gitlab-ci.yml | 3 ---
ci/docker_install_php.sh | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40078eb7fb9..9916f221c66 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 90f9dd8d810..8a083ee42f3 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
--
GitLab