diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3e3a7d..fbdaba3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,18 +11,20 @@ services: test:7: before_script: - - bash build/docker_install.sh > /dev/null + - sh build/docker_install.sh > /dev/null - curl -sS https://getcomposer.org/installer | php - - php composer.phar install --no-dev - image: php:7 + - apk add --no-cache php7-apcu php7-memcached php7-phpdbg + - php composer.phar install --ignore-platform-reqs + image: php:7-alpine script: - - phpunit -c build + - phpdbg -qrr -- ./vendor/bin/phpunit -c build test:7.1: before_script: - - bash build/docker_install.sh > /dev/null + - sh build/docker_install.sh > /dev/null - curl -sS https://getcomposer.org/installer | php - - php composer.phar install --no-dev - image: php:7.1 + - apk add --no-cache php7.1-apcu php7.1-memcached php7.1-phpdbg + - php composer.phar install --ignore-platform-reqs + image: php:7.1-alpine script: - - phpunit -c build + - phpdbg -qrr -- ./vendor/bin/phpunit -c build diff --git a/build/docker_install.sh b/build/docker_install.sh index 8690f16..ee4cd02 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -3,36 +3,13 @@ # We need to install dependencies only for Docker [[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 -# Where am I? -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - set -xe # Install git (the php image doesn't have it) which is required by composer -apt-get update -yqq -apt-get install \ - git \ - unzip \ - libfreetype6 \ - libjpeg62-turbo \ - libmcrypt4 \ - libpng12-0 \ - libfreetype6-dev \ - libjpeg-dev \ - libmcrypt-dev \ - libpng12-dev \ - libxslt1-dev \ - libxslt1.1 \ - zlib1g-dev \ - -yqq - -# Install phpunit, the tool that we will use for testing -curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar -chmod +x /usr/local/bin/phpunit - -# Install extensions -docker-php-ext-install apcu -docker-php-ext-install memcache -docker-php-ext-install memcached -docker-php-ext-install xsl -docker-php-ext-install zip \ No newline at end of file +echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories +apk upgrade --update && apk add --no-cache \ + g++ \ + make \ + automake \ + curl \ + git \ No newline at end of file