diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-09-14 13:07:28 +0200 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-09-14 13:07:28 +0200 |
| commit | b53198fe6cb51b08da9c19962bff004b2295586a (patch) | |
| tree | 4566e088710e6ec7354a63b1a3fabb46495edca6 /.drone.yml | |
| parent | 2ed8e7fa8fb65ca3766a327e77a81e5137916400 (diff) | |
Use a newer version of the nextcloudci/php7.1 Docker image in Drone
The "php7.1" and "php7.1-integration" tests are not actually being run
in Drone; when the command "more ./tests/autoconfig-oracle.php" is
executed by "core_install.sh" the execution of the remaining Drone
commands is broken (strange... probably some black magic related to TTYs
or something like that), and thus the tests are not run (although no
error is issued, so it wrongly seems that they were successful).
The problem occurs on CentOS based Docker images, but not on Debian
based ones. Therefore, the base images for the "php7.1" and
"php7.1-integration" tests were changed to use a newer version of the
"nextcloudci/php7.1" image, which is now based on Debian instead of
CentOS like the older ones.
This also removes the need of installing "wget", as it is already
included in the newer image too.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to '.drone.yml')
| -rw-r--r-- | .drone.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/.drone.yml b/.drone.yml index eff24ac81..3f98ea62c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -126,15 +126,12 @@ pipeline: matrix: TESTS: php7.0 php7.1: - image: nextcloudci/php7.1:php7.1-3 + image: nextcloudci/php7.1:php7.1-15 environment: - APP_NAME=spreed - CORE_BRANCH=master - DB=sqlite commands: - # FIXME: Move into Docker image - - yum -y install wget - # Pre-setup steps - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB @@ -149,15 +146,12 @@ pipeline: matrix: TESTS: php7.1 php7.1-integration: - image: nextcloudci/php7.1:php7.1-3 + image: nextcloudci/php7.1:php7.1-15 environment: - APP_NAME=spreed - CORE_BRANCH=master - DB=sqlite commands: - # FIXME: Move into Docker image - - yum -y install wget - # Pre-setup steps - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB |