From f15ea8ebb8782f458986bd9b71d416a539aa4343 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 31 Jan 2018 14:04:50 -0500 Subject: [PATCH] Attempt to use lighter docker images for gitlab builds --- .gitlab-ci.yml | 2 +- build/docker_install.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a4dede..ca6b864 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ before_script: - php composer.phar install --ignore-platform-reqs services: - mysql:latest - - postgres:latest + - postgres:alpine variables: MYSQL_ROOT_PASSWORD: foo-bar-baz diff --git a/build/docker_install.sh b/build/docker_install.sh index 41bd231..2600298 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -13,7 +13,8 @@ set -xe 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 add --no-cache \ curl \ - git + git \ + postgresql-dev # Install phpunit, the tool that we will use for testing curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar @@ -25,8 +26,8 @@ mv "$DIR/../tests/settings-ci.json" "$DIR/../tests/settings.json" # Install mysql driver # Here you can install any other extension that you need -docker-php-ext-install pdo_mysql -docker-php-ext-install pdo_pgsql +docker-php-ext-install pdo pdo_mysql pdo_pgsql +#docker-php-ext-install pdo_pgsql #docker-php-ext-install pdo_oci #docker-php-ext-install interbase #docker-php-ext-install pdo_firebird