Make sure docker sh script doesn't have CRLF line endings
This commit is contained in:
parent
3f7711dd20
commit
8ba6e83032
@ -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
|
@ -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
|
Loading…
Reference in New Issue
Block a user