diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-06 15:48:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 15:48:30 +0300 |
| commit | e1abe5a62b34d5de94b258b665ca612a973e2dbd (patch) | |
| tree | aa9f2f2f59755fe4cb40b37e5788ecddd2065ab4 | |
| parent | 54666a64181f6ea57f9603e6e8b77ffffa6b4ad8 (diff) | |
| parent | cb69571cda0d894d085e8d62a44bd8d3769e8df1 (diff) | |
Merge pull request #324 from nextcloud/fix-naming-issue-drone
Fix docker image naming issue for CI
| -rw-r--r-- | .drone.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.drone.yml b/.drone.yml index fc86e72c2b9..79f6d8262be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,36 +1,37 @@ build: - integration: - image: morrisjobke/nextcloud-ci-php7:1.0.3 - commands: - - git submodule update --init - - ./occ maintenance:install --admin-pass=admin - - cd build/integration - - ./run.sh jsunit: - image: morrisjobke/nextcloud-ci-jsunit:1.0.2 + image: nextcloudci/jsunit:1.0.6 commands: - ./autotest-js.sh sqlite: - image: morrisjobke/nextcloud-ci-php7:1.0 + image: nextcloudci/php5.6:1.0.6 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite mysql: - image: morrisjobke/nextcloud-ci-php7:1.0.4 + image: nextcloudci/php5.6:1.0.6 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./autotest.sh mysql postgres: - image: morrisjobke/nextcloud-ci-php7:1.0 + image: nextcloudci/php5.6:1.0.6 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./autotest.sh pgsql + integration: + image: nextcloudci/php5.6:1.0.6 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh compose: cache: |