merge independent services
This commit is contained in:
		
							
								
								
									
										19
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								.travis.yml
									
									
									
									
									
								
							@@ -7,9 +7,9 @@ env:
 | 
			
		||||
  matrix:
 | 
			
		||||
    - 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=70 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 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 postgres postgres-postgis 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=70 BUILD_SERVICE=workspace
 | 
			
		||||
@@ -19,11 +19,11 @@ env:
 | 
			
		||||
    - PHP_VERSION=70 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=70 BUILD_SERVICE="php-worker"
 | 
			
		||||
    - PHP_VERSION=71 BUILD_SERVICE="php-worker"
 | 
			
		||||
    # - PHP_VERSION=56 BUILD_SERVICE=php-worker
 | 
			
		||||
    - PHP_VERSION=70 BUILD_SERVICE=php-worker
 | 
			
		||||
    - PHP_VERSION=71 BUILD_SERVICE=php-worker
 | 
			
		||||
 | 
			
		||||
    - PHP_VERSION=56 BUILD_SERVICE=mssql
 | 
			
		||||
    - PHP_VERSION=70 BUILD_SERVICE=mssql
 | 
			
		||||
@@ -37,9 +37,8 @@ env:
 | 
			
		||||
    - PHP_VERSION=70 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=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer 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"
 | 
			
		||||
    - PHP_VERSION="N/A" BUILD_SERVICE="adminer phpmyadmin pgadmin"
 | 
			
		||||
    - PHP_VERSION="N/A" BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
 | 
			
		||||
 | 
			
		||||
# Installing a newer Docker version
 | 
			
		||||
before_install:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user