From ebc8006e042e19cbe4a6ea9f1df48e85c3f84dda Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Mon, 18 Jul 2016 09:58:23 -0400 Subject: [PATCH] Make sure docker sh script doesn't have CRLF line endings --- .gitlab-ci.yml | 60 ++++++++++++++++++++--------------------- build/docker_install.sh | 38 +++++++++++++------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 718b39a5..373e92c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,31 +1,31 @@ -before_script: - # Install dependencies - - bash build/docker_install.sh > /dev/null - # Install composer dependencies - - curl -sS https://getcomposer.org/installer | php - - php composer.phar install - -# Composer stores all downloaded packages in the vendor/ directory. -# Do not use the following if the vendor/ directory is commited to -# your git repository. -cache: - paths: - - vendor/ - -services: - - redis:latest - -test:5.5: - image: php:5.5 - script: - - phpunit -c build - -test:5.6: - image: php:5.6 - script: - - phpunit -c build - -test:7: - image: php:7 - script: +before_script: + # Install dependencies + - bash build/docker_install.sh > /dev/null + # Install composer dependencies + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install + +# Composer stores all downloaded packages in the vendor/ directory. +# Do not use the following if the vendor/ directory is commited to +# your git repository. +cache: + paths: + - vendor/ + +services: + - redis:latest + +test:5.5: + image: php:5.5 + script: + - phpunit -c build + +test:5.6: + image: php:5.6 + script: + - phpunit -c build + +test:7: + image: php:7 + script: - phpunit -c build \ No newline at end of file diff --git a/build/docker_install.sh b/build/docker_install.sh index 784e6a34..16465a8d 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -1,20 +1,20 @@ -#!/bin/bash - -# We need to install dependencies only for Docker -[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 - -set -xe - -# Install git (the php image doesn't have it) which is required by composer -apt-get update -yqq -apt-get install git sqlite3 -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 mysql driver -# Here you can install any other extension that you need -docker-php-ext-install pdo_sqlite -pecl install redis +#!/bin/bash + +# We need to install dependencies only for Docker +[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 + +set -xe + +# Install git (the php image doesn't have it) which is required by composer +apt-get update -yqq +apt-get install git sqlite3 -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 mysql driver +# Here you can install any other extension that you need +docker-php-ext-install pdo_sqlite +pecl install redis docker-php-ext-enable redis \ No newline at end of file