diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9429440910b1568ee58e8b598c0d3dcb02516f72..c80b17993acc5d4ea390f8b259ed529f3bc7d0d9 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ services: - postgres:10.1 - httpd:latest - - selenium/standalone-firefox variables: POSTGRES_DB: "MaarchCourrier" diff --git a/ci/docker_install_php.sh b/ci/docker_install_php.sh index de838bdc4569ea3e92d2d41a0e0d96f5ed60d0d3..5065b055e9891df1d826ff1fc0f6dcc82c9f390a 100755 --- a/ci/docker_install_php.sh +++ b/ci/docker_install_php.sh @@ -12,4 +12,10 @@ apt-get install -y libpq-dev libxml2-dev libxslt1-dev libpng-dev unoconv xpdf-ut && docker-php-ext-install xsl \ && pecl install xdebug-2.9.3 \ && docker-php-ext-enable xdebug \ -&& docker-php-ext-install gd +&& docker-php-ext-install gd \ +&& FIREFOX_URL="https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US" \ +&& ACTUAL_URL=$(curl -Ls -o /dev/null -w %{url_effective} $FIREFOX_URL) \ +&& curl --silent --show-error --location --fail --retry 3 --output /tmp/firefox.tar.bz2 $ACTUAL_URL \ +&& sudo tar -xvjf /tmp/firefox.tar.bz2 -C /opt \ +&& sudo ln -s /opt/firefox/firefox /usr/local/bin/firefox \ +&& firefox --version