merge independent services

This commit is contained in:
Shao Yu Lung 2017-12-10 23:18:57 +08:00
parent e1ccd84c16
commit 2156139b5a

View File

@ -7,9 +7,9 @@ env:
matrix: matrix:
- HUGO_VERSION=0.20.2 - HUGO_VERSION=0.20.2
- PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
- PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
- PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
- PHP_VERSION=56 BUILD_SERVICE=workspace - PHP_VERSION=56 BUILD_SERVICE=workspace
- PHP_VERSION=70 BUILD_SERVICE=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace
@ -19,11 +19,11 @@ env:
- PHP_VERSION=70 BUILD_SERVICE=php-fpm - PHP_VERSION=70 BUILD_SERVICE=php-fpm
- PHP_VERSION=71 BUILD_SERVICE=php-fpm - PHP_VERSION=71 BUILD_SERVICE=php-fpm
- PHP_VERSION=hhvm BUILD_SERVICE="hhvm" - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
# - PHP_VERSION=56 BUILD_SERVICE="php-worker" # - PHP_VERSION=56 BUILD_SERVICE=php-worker
- PHP_VERSION=70 BUILD_SERVICE="php-worker" - PHP_VERSION=70 BUILD_SERVICE=php-worker
- PHP_VERSION=71 BUILD_SERVICE="php-worker" - PHP_VERSION=71 BUILD_SERVICE=php-worker
- PHP_VERSION=56 BUILD_SERVICE=mssql - PHP_VERSION=56 BUILD_SERVICE=mssql
- PHP_VERSION=70 BUILD_SERVICE=mssql - PHP_VERSION=70 BUILD_SERVICE=mssql
@ -37,9 +37,8 @@ env:
- PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=70 BUILD_SERVICE=aerospike
- PHP_VERSION=71 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike
- PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - PHP_VERSION="N/A" BUILD_SERVICE="adminer phpmyadmin pgadmin"
- PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - PHP_VERSION="N/A" BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
- PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
# Installing a newer Docker version # Installing a newer Docker version
before_install: before_install: