From e19ecdf3f792e78dec7c3bc6f9110426d6db4ab1 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 8 Dec 2017 14:26:25 +1100 Subject: [PATCH] Improve CI processing --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1d2d4a..169f821 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is a template, and might need editing before it works on your project. # Official framework image. Look for the different tagged releases at: # https://hub.docker.com/r/library/php -image: php:7.1-fpm +image: registry.leenooks.net/leenooks/php:7.1-fpm-plus # Pick zero or more services to be used on all builds. # Only needed when using a docker container to run your tests in. @@ -24,27 +24,28 @@ cache: # services such as redis or postgres before_script: # Update packages - - echo 'deb http://deb.debian.org/debian jessie non-free' >> /etc/apt/sources.list.d/non-free.list - - apt-get update -yqq + #- echo 'deb http://deb.debian.org/debian jessie non-free' >> /etc/apt/sources.list.d/non-free.list + #- apt-get update -yqq # Upgrade to Node 7 - curl -sL https://deb.nodesource.com/setup_7.x | bash - # Install dependencies - - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev pkg-config libsnmp-dev snmp-mibs-downloader -yqq - - download-mibs + #- apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev pkg-config libsnmp-dev snmp-mibs-downloader -yqq + #- download-mibs + - apt-get install git nodejs -yqq # Install php extensions - - docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ - - docker-php-ext-install pdo_mysql bz2 gettext sockets gmp gd pcntl snmp - - docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache + #- docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ + #- docker-php-ext-install pdo_mysql bz2 gettext sockets gmp gd pcntl snmp + #- docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache # Install & enable Xdebug for code coverage reports - pecl install xdebug - docker-php-ext-enable xdebug # Install Composer and project dependencies. - - curl -sS https://getcomposer.org/installer | php + - (curl -sS https://getcomposer.org/installer || curl -vI https://getcomposer.org/installer && exit 1) | php - php composer.phar install # Install Node dependencies.