diff --git a/tests/before_script.sh b/tests/before_script.sh index 4b39f88..73486ab 100755 --- a/tests/before_script.sh +++ b/tests/before_script.sh @@ -1,3 +1,35 @@ +install_nginx() { + $superuser apt-get install -y nginx +} + +use_php_fpm() { + root="$(pwd)/tests/PHPCurlClass" + $superuser tee /etc/nginx/sites-enabled/default < /etc/apt/sources.list + RUN apt-get --assume-yes --quiet update RUN apt-get --assume-yes --quiet install git && \ diff --git a/tests/dockerfiles/php55/Dockerfile b/tests/dockerfiles/php55/Dockerfile index 48950ee..2f7bf7e 100644 --- a/tests/dockerfiles/php55/Dockerfile +++ b/tests/dockerfiles/php55/Dockerfile @@ -1,6 +1,15 @@ -FROM php:5.5-cli +FROM php:5.5-fpm ENV DEBIAN_FRONTEND noninteractive +# Fix error: +# "E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?". +RUN printf "%s\n" \ + "deb http://archive.debian.org/debian/ jessie main" \ + "deb-src http://archive.debian.org/debian/ jessie main" \ + "deb http://security.debian.org jessie/updates main" \ + "deb-src http://security.debian.org jessie/updates main" \ + > /etc/apt/sources.list + RUN apt-get --assume-yes --quiet update RUN apt-get --assume-yes --quiet install git && \ diff --git a/tests/dockerfiles/php56/Dockerfile b/tests/dockerfiles/php56/Dockerfile index 467c99f..249d7db 100644 --- a/tests/dockerfiles/php56/Dockerfile +++ b/tests/dockerfiles/php56/Dockerfile @@ -1,4 +1,4 @@ -FROM php:5.6-cli +FROM php:5.6-fpm ENV DEBIAN_FRONTEND noninteractive RUN apt-get --assume-yes --quiet update