Make sure docker sh script doesn't have CRLF line endings

This commit is contained in:
Timothy Warren 2016-07-18 09:58:23 -04:00
parent 3f7711dd20
commit 8ba6e83032
2 changed files with 49 additions and 49 deletions

View File

@ -1,31 +1,31 @@
before_script: before_script:
# Install dependencies # Install dependencies
- bash build/docker_install.sh > /dev/null - bash build/docker_install.sh > /dev/null
# Install composer dependencies # Install composer dependencies
- curl -sS https://getcomposer.org/installer | php - curl -sS https://getcomposer.org/installer | php
- php composer.phar install - php composer.phar install
# Composer stores all downloaded packages in the vendor/ directory. # Composer stores all downloaded packages in the vendor/ directory.
# Do not use the following if the vendor/ directory is commited to # Do not use the following if the vendor/ directory is commited to
# your git repository. # your git repository.
cache: cache:
paths: paths:
- vendor/ - vendor/
services: services:
- redis:latest - redis:latest
test:5.5: test:5.5:
image: php:5.5 image: php:5.5
script: script:
- phpunit -c build - phpunit -c build
test:5.6: test:5.6:
image: php:5.6 image: php:5.6
script: script:
- phpunit -c build - phpunit -c build
test:7: test:7:
image: php:7 image: php:7
script: script:
- phpunit -c build - phpunit -c build

View File

@ -1,20 +1,20 @@
#!/bin/bash #!/bin/bash
# We need to install dependencies only for Docker # We need to install dependencies only for Docker
[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 [[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0
set -xe set -xe
# Install git (the php image doesn't have it) which is required by composer # Install git (the php image doesn't have it) which is required by composer
apt-get update -yqq apt-get update -yqq
apt-get install git sqlite3 -yqq apt-get install git sqlite3 -yqq
# Install phpunit, the tool that we will use for testing # Install phpunit, the tool that we will use for testing
curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit
# Install mysql driver # Install mysql driver
# Here you can install any other extension that you need # Here you can install any other extension that you need
docker-php-ext-install pdo_sqlite docker-php-ext-install pdo_sqlite
pecl install redis pecl install redis
docker-php-ext-enable redis docker-php-ext-enable redis