From e8b49a9fe5957a4e2bf9d0450d2173cd3419d48a Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 15:13:18 +0800 Subject: [PATCH 1/9] split build jobs --- .travis.yml | 149 ++++++++++++++++++++++++++++++++++++++++++++++-- travis-build.sh | 2 +- 2 files changed, 146 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccbb38dc..95369603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,151 @@ services: - docker env: - matrix: - - PHP_VERSION=56 - - PHP_VERSION=70 - - PHP_VERSION=71 + matrix: + - PHP_VERSION=56 BUILD_SERVICE=applications + - PHP_VERSION=70 BUILD_SERVICE=applications + - PHP_VERSION=71 BUILD_SERVICE=applications + + - PHP_VERSION=56 BUILD_SERVICE=workspace + - PHP_VERSION=70 BUILD_SERVICE=workspace + - PHP_VERSION=71 BUILD_SERVICE=workspace + + - PHP_VERSION=56 BUILD_SERVICE=php-fpm + - PHP_VERSION=70 BUILD_SERVICE=php-fpm + - PHP_VERSION=71 BUILD_SERVICE=php-fpm + + - 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=nginx + - PHP_VERSION=70 BUILD_SERVICE=nginx + - PHP_VERSION=71 BUILD_SERVICE=nginx + + - PHP_VERSION=56 BUILD_SERVICE=blackfire + - PHP_VERSION=70 BUILD_SERVICE=blackfire + - PHP_VERSION=71 BUILD_SERVICE=blackfire + + - PHP_VERSION=56 BUILD_SERVICE=apache2 + - PHP_VERSION=70 BUILD_SERVICE=apache2 + - PHP_VERSION=71 BUILD_SERVICE=apache2 + + - PHP_VERSION=56 BUILD_SERVICE=hhvm + - PHP_VERSION=70 BUILD_SERVICE=hhvm + - PHP_VERSION=71 BUILD_SERVICE=hhvm + + - PHP_VERSION=56 BUILD_SERVICE=minio + - PHP_VERSION=70 BUILD_SERVICE=minio + - PHP_VERSION=71 BUILD_SERVICE=minio + + - PHP_VERSION=56 BUILD_SERVICE=mysql + - PHP_VERSION=70 BUILD_SERVICE=mysql + - PHP_VERSION=71 BUILD_SERVICE=mysql + + - PHP_VERSION=56 BUILD_SERVICE=percona + - PHP_VERSION=70 BUILD_SERVICE=percona + - PHP_VERSION=71 BUILD_SERVICE=percona + + - PHP_VERSION=56 BUILD_SERVICE=mssql + - PHP_VERSION=70 BUILD_SERVICE=mssql + - PHP_VERSION=71 BUILD_SERVICE=mssql + + - PHP_VERSION=56 BUILD_SERVICE=mariadb + - PHP_VERSION=70 BUILD_SERVICE=mariadb + - PHP_VERSION=71 BUILD_SERVICE=mariadb + + - PHP_VERSION=56 BUILD_SERVICE=postgres + - PHP_VERSION=70 BUILD_SERVICE=postgres + - PHP_VERSION=71 BUILD_SERVICE=postgres + + - PHP_VERSION=56 BUILD_SERVICE=postgres-postgis + - PHP_VERSION=70 BUILD_SERVICE=postgres-postgis + - PHP_VERSION=71 BUILD_SERVICE=postgres-postgis + + - PHP_VERSION=56 BUILD_SERVICE=neo4j + - PHP_VERSION=70 BUILD_SERVICE=neo4j + - PHP_VERSION=71 BUILD_SERVICE=neo4j + + - PHP_VERSION=56 BUILD_SERVICE=mongo + - PHP_VERSION=70 BUILD_SERVICE=mongo + - PHP_VERSION=71 BUILD_SERVICE=mongo + + - PHP_VERSION=56 BUILD_SERVICE=rethinkdb + - PHP_VERSION=70 BUILD_SERVICE=rethinkdb + - PHP_VERSION=71 BUILD_SERVICE=rethinkdb + + - PHP_VERSION=56 BUILD_SERVICE=redis + - PHP_VERSION=70 BUILD_SERVICE=redis + - PHP_VERSION=71 BUILD_SERVICE=redis + + - PHP_VERSION=56 BUILD_SERVICE=aerospike + - PHP_VERSION=70 BUILD_SERVICE=aerospike + - PHP_VERSION=71 BUILD_SERVICE=aerospike + + - PHP_VERSION=56 BUILD_SERVICE=memcached + - PHP_VERSION=70 BUILD_SERVICE=memcached + - PHP_VERSION=71 BUILD_SERVICE=memcached + + - PHP_VERSION=56 BUILD_SERVICE=beanstalkd + - PHP_VERSION=70 BUILD_SERVICE=beanstalkd + - PHP_VERSION=71 BUILD_SERVICE=beanstalkd + + - PHP_VERSION=56 BUILD_SERVICE=rabbitmq + - PHP_VERSION=70 BUILD_SERVICE=rabbitmq + - PHP_VERSION=71 BUILD_SERVICE=rabbitmq + + - PHP_VERSION=56 BUILD_SERVICE=beanstalkd-console + - PHP_VERSION=70 BUILD_SERVICE=beanstalkd-console + - PHP_VERSION=71 BUILD_SERVICE=beanstalkd-console + + - PHP_VERSION=56 BUILD_SERVICE=caddy + - PHP_VERSION=70 BUILD_SERVICE=caddy + - PHP_VERSION=71 BUILD_SERVICE=caddy + + - PHP_VERSION=56 BUILD_SERVICE=phpmyadmin + - PHP_VERSION=70 BUILD_SERVICE=phpmyadmin + - PHP_VERSION=71 BUILD_SERVICE=phpmyadmin + + - PHP_VERSION=56 BUILD_SERVICE=adminer + - PHP_VERSION=70 BUILD_SERVICE=adminer + - PHP_VERSION=71 BUILD_SERVICE=adminer + + - PHP_VERSION=56 BUILD_SERVICE=pgadmin + - PHP_VERSION=70 BUILD_SERVICE=pgadmin + - PHP_VERSION=71 BUILD_SERVICE=pgadmin + + - PHP_VERSION=56 BUILD_SERVICE=elasticsearch + - PHP_VERSION=70 BUILD_SERVICE=elasticsearch + - PHP_VERSION=71 BUILD_SERVICE=elasticsearch + + - PHP_VERSION=56 BUILD_SERVICE=certbot + - PHP_VERSION=70 BUILD_SERVICE=certbot + - PHP_VERSION=71 BUILD_SERVICE=certbot + + - PHP_VERSION=56 BUILD_SERVICE=mailhog + - PHP_VERSION=70 BUILD_SERVICE=mailhog + - PHP_VERSION=71 BUILD_SERVICE=mailhog + + - PHP_VERSION=56 BUILD_SERVICE=selenium + - PHP_VERSION=70 BUILD_SERVICE=selenium + - PHP_VERSION=71 BUILD_SERVICE=selenium + + - PHP_VERSION=56 BUILD_SERVICE=proxy + - PHP_VERSION=70 BUILD_SERVICE=proxy + - PHP_VERSION=71 BUILD_SERVICE=proxy + + - PHP_VERSION=56 BUILD_SERVICE=proxy2 + - PHP_VERSION=70 BUILD_SERVICE=proxy2 + - PHP_VERSION=71 BUILD_SERVICE=proxy2 + + - PHP_VERSION=56 BUILD_SERVICE=balancer + - PHP_VERSION=70 BUILD_SERVICE=balancer + - PHP_VERSION=71 BUILD_SERVICE=balancer + + - PHP_VERSION=56 BUILD_SERVICE=jenkins + - PHP_VERSION=70 BUILD_SERVICE=jenkins + - PHP_VERSION=71 BUILD_SERVICE=jenkins + - HUGO_VERSION=0.20.2 # Installing a newer Docker version diff --git a/travis-build.sh b/travis-build.sh index 8cabad86..66223d03 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -15,7 +15,7 @@ if [ -n "${PHP_VERSION}" ]; then sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env sed -i -- 's/=false/=true/g' .env cat .env - docker-compose build + docker-compose build ${BUILD_SERVICE} docker images fi From 3b0e4cd05dfc7ada51825bf5793a8c933748f4b9 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 16:02:23 +0800 Subject: [PATCH 2/9] join short time jobs --- .travis.yml | 144 +++++++++++----------------------------------------- 1 file changed, 30 insertions(+), 114 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95369603..c5061dbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ services: env: matrix: - - PHP_VERSION=56 BUILD_SERVICE=applications - - PHP_VERSION=70 BUILD_SERVICE=applications - - PHP_VERSION=71 BUILD_SERVICE=applications + - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona" + - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona" + - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona" - PHP_VERSION=56 BUILD_SERVICE=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace @@ -17,137 +17,53 @@ env: - PHP_VERSION=70 BUILD_SERVICE=php-fpm - PHP_VERSION=71 BUILD_SERVICE=php-fpm - - 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 hhvm" + - PHP_VERSION=70 BUILD_SERVICE="php-worker hhvm" + - PHP_VERSION=71 BUILD_SERVICE="php-worker hhvm" - - PHP_VERSION=56 BUILD_SERVICE=nginx - - PHP_VERSION=70 BUILD_SERVICE=nginx - - PHP_VERSION=71 BUILD_SERVICE=nginx + - PHP_VERSION=56 BUILD_SERVICE="nginx caddy apache2" + - PHP_VERSION=70 BUILD_SERVICE="nginx caddy apache2" + - PHP_VERSION=71 BUILD_SERVICE="nginx caddy apache2" - - PHP_VERSION=56 BUILD_SERVICE=blackfire - - PHP_VERSION=70 BUILD_SERVICE=blackfire - - PHP_VERSION=71 BUILD_SERVICE=blackfire - - - PHP_VERSION=56 BUILD_SERVICE=apache2 - - PHP_VERSION=70 BUILD_SERVICE=apache2 - - PHP_VERSION=71 BUILD_SERVICE=apache2 - - - PHP_VERSION=56 BUILD_SERVICE=hhvm - - PHP_VERSION=70 BUILD_SERVICE=hhvm - - PHP_VERSION=71 BUILD_SERVICE=hhvm - - - PHP_VERSION=56 BUILD_SERVICE=minio - - PHP_VERSION=70 BUILD_SERVICE=minio - - PHP_VERSION=71 BUILD_SERVICE=minio - - - PHP_VERSION=56 BUILD_SERVICE=mysql - - PHP_VERSION=70 BUILD_SERVICE=mysql - - PHP_VERSION=71 BUILD_SERVICE=mysql - - - PHP_VERSION=56 BUILD_SERVICE=percona - - PHP_VERSION=70 BUILD_SERVICE=percona - - PHP_VERSION=71 BUILD_SERVICE=percona + - PHP_VERSION=56 BUILD_SERVICE="mysql mariadb phpmyadmin" + - PHP_VERSION=70 BUILD_SERVICE="mysql mariadb phpmyadmin" + - PHP_VERSION=71 BUILD_SERVICE="mysql mariadb phpmyadmin" - PHP_VERSION=56 BUILD_SERVICE=mssql - PHP_VERSION=70 BUILD_SERVICE=mssql - PHP_VERSION=71 BUILD_SERVICE=mssql - - PHP_VERSION=56 BUILD_SERVICE=mariadb - - PHP_VERSION=70 BUILD_SERVICE=mariadb - - PHP_VERSION=71 BUILD_SERVICE=mariadb + - PHP_VERSION=56 BUILD_SERVICE="postgres postgres-postgis pgadmin" + - PHP_VERSION=70 BUILD_SERVICE="postgres postgres-postgis pgadmin" + - PHP_VERSION=71 BUILD_SERVICE="postgres postgres-postgis pgadmin" - - PHP_VERSION=56 BUILD_SERVICE=postgres - - PHP_VERSION=70 BUILD_SERVICE=postgres - - PHP_VERSION=71 BUILD_SERVICE=postgres - - - PHP_VERSION=56 BUILD_SERVICE=postgres-postgis - - PHP_VERSION=70 BUILD_SERVICE=postgres-postgis - - PHP_VERSION=71 BUILD_SERVICE=postgres-postgis - - - PHP_VERSION=56 BUILD_SERVICE=neo4j - - PHP_VERSION=70 BUILD_SERVICE=neo4j - - PHP_VERSION=71 BUILD_SERVICE=neo4j - - - PHP_VERSION=56 BUILD_SERVICE=mongo - - PHP_VERSION=70 BUILD_SERVICE=mongo - - PHP_VERSION=71 BUILD_SERVICE=mongo + - PHP_VERSION=56 BUILD_SERVICE="neo4j mongo redis" + - PHP_VERSION=70 BUILD_SERVICE="neo4j mongo redis" + - PHP_VERSION=71 BUILD_SERVICE="neo4j mongo redis" - PHP_VERSION=56 BUILD_SERVICE=rethinkdb - PHP_VERSION=70 BUILD_SERVICE=rethinkdb - PHP_VERSION=71 BUILD_SERVICE=rethinkdb - - PHP_VERSION=56 BUILD_SERVICE=redis - - PHP_VERSION=70 BUILD_SERVICE=redis - - PHP_VERSION=71 BUILD_SERVICE=redis - - PHP_VERSION=56 BUILD_SERVICE=aerospike - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike - - PHP_VERSION=56 BUILD_SERVICE=memcached - - PHP_VERSION=70 BUILD_SERVICE=memcached - - PHP_VERSION=71 BUILD_SERVICE=memcached + - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" + - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" + - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" - - PHP_VERSION=56 BUILD_SERVICE=beanstalkd - - PHP_VERSION=70 BUILD_SERVICE=beanstalkd - - PHP_VERSION=71 BUILD_SERVICE=beanstalkd + - PHP_VERSION=56 BUILD_SERVICE="adminer elasticsearch certbot mailhog" + - PHP_VERSION=70 BUILD_SERVICE="adminer elasticsearch certbot mailhog" + - PHP_VERSION=71 BUILD_SERVICE="adminer elasticsearch certbot mailhog" - - PHP_VERSION=56 BUILD_SERVICE=rabbitmq - - PHP_VERSION=70 BUILD_SERVICE=rabbitmq - - PHP_VERSION=71 BUILD_SERVICE=rabbitmq + - PHP_VERSION=56 BUILD_SERVICE="selenium jenkins" + - PHP_VERSION=70 BUILD_SERVICE="selenium jenkins" + - PHP_VERSION=71 BUILD_SERVICE="selenium jenkins" - - PHP_VERSION=56 BUILD_SERVICE=beanstalkd-console - - PHP_VERSION=70 BUILD_SERVICE=beanstalkd-console - - PHP_VERSION=71 BUILD_SERVICE=beanstalkd-console - - - PHP_VERSION=56 BUILD_SERVICE=caddy - - PHP_VERSION=70 BUILD_SERVICE=caddy - - PHP_VERSION=71 BUILD_SERVICE=caddy - - - PHP_VERSION=56 BUILD_SERVICE=phpmyadmin - - PHP_VERSION=70 BUILD_SERVICE=phpmyadmin - - PHP_VERSION=71 BUILD_SERVICE=phpmyadmin - - - PHP_VERSION=56 BUILD_SERVICE=adminer - - PHP_VERSION=70 BUILD_SERVICE=adminer - - PHP_VERSION=71 BUILD_SERVICE=adminer - - - PHP_VERSION=56 BUILD_SERVICE=pgadmin - - PHP_VERSION=70 BUILD_SERVICE=pgadmin - - PHP_VERSION=71 BUILD_SERVICE=pgadmin - - - PHP_VERSION=56 BUILD_SERVICE=elasticsearch - - PHP_VERSION=70 BUILD_SERVICE=elasticsearch - - PHP_VERSION=71 BUILD_SERVICE=elasticsearch - - - PHP_VERSION=56 BUILD_SERVICE=certbot - - PHP_VERSION=70 BUILD_SERVICE=certbot - - PHP_VERSION=71 BUILD_SERVICE=certbot - - - PHP_VERSION=56 BUILD_SERVICE=mailhog - - PHP_VERSION=70 BUILD_SERVICE=mailhog - - PHP_VERSION=71 BUILD_SERVICE=mailhog - - - PHP_VERSION=56 BUILD_SERVICE=selenium - - PHP_VERSION=70 BUILD_SERVICE=selenium - - PHP_VERSION=71 BUILD_SERVICE=selenium - - - PHP_VERSION=56 BUILD_SERVICE=proxy - - PHP_VERSION=70 BUILD_SERVICE=proxy - - PHP_VERSION=71 BUILD_SERVICE=proxy - - - PHP_VERSION=56 BUILD_SERVICE=proxy2 - - PHP_VERSION=70 BUILD_SERVICE=proxy2 - - PHP_VERSION=71 BUILD_SERVICE=proxy2 - - - PHP_VERSION=56 BUILD_SERVICE=balancer - - PHP_VERSION=70 BUILD_SERVICE=balancer - - PHP_VERSION=71 BUILD_SERVICE=balancer - - - PHP_VERSION=56 BUILD_SERVICE=jenkins - - PHP_VERSION=70 BUILD_SERVICE=jenkins - - PHP_VERSION=71 BUILD_SERVICE=jenkins + - PHP_VERSION=56 BUILD_SERVICE="proxy proxy2 balancer" + - PHP_VERSION=70 BUILD_SERVICE="proxy proxy2 balancer" + - PHP_VERSION=71 BUILD_SERVICE="proxy proxy2 balancer" - HUGO_VERSION=0.20.2 From 6843f508fad9387e57a980ae9fe9ef7abbac8ca6 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 17:08:10 +0800 Subject: [PATCH 3/9] join short time jobs --- .travis.yml | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5061dbc..2c192886 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ services: env: matrix: - - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona" - - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona" - - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona" + - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" + - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" + - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" - PHP_VERSION=56 BUILD_SERVICE=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace @@ -21,10 +21,6 @@ env: - PHP_VERSION=70 BUILD_SERVICE="php-worker hhvm" - PHP_VERSION=71 BUILD_SERVICE="php-worker hhvm" - - PHP_VERSION=56 BUILD_SERVICE="nginx caddy apache2" - - PHP_VERSION=70 BUILD_SERVICE="nginx caddy apache2" - - PHP_VERSION=71 BUILD_SERVICE="nginx caddy apache2" - - PHP_VERSION=56 BUILD_SERVICE="mysql mariadb phpmyadmin" - PHP_VERSION=70 BUILD_SERVICE="mysql mariadb phpmyadmin" - PHP_VERSION=71 BUILD_SERVICE="mysql mariadb phpmyadmin" @@ -33,13 +29,9 @@ env: - PHP_VERSION=70 BUILD_SERVICE=mssql - PHP_VERSION=71 BUILD_SERVICE=mssql - - PHP_VERSION=56 BUILD_SERVICE="postgres postgres-postgis pgadmin" - - PHP_VERSION=70 BUILD_SERVICE="postgres postgres-postgis pgadmin" - - PHP_VERSION=71 BUILD_SERVICE="postgres postgres-postgis pgadmin" - - - PHP_VERSION=56 BUILD_SERVICE="neo4j mongo redis" - - PHP_VERSION=70 BUILD_SERVICE="neo4j mongo redis" - - PHP_VERSION=71 BUILD_SERVICE="neo4j mongo redis" + - PHP_VERSION=56 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" + - PHP_VERSION=70 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" + - PHP_VERSION=71 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" - PHP_VERSION=56 BUILD_SERVICE=rethinkdb - PHP_VERSION=70 BUILD_SERVICE=rethinkdb @@ -49,21 +41,9 @@ env: - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike - - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" - - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" - - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq" - - - PHP_VERSION=56 BUILD_SERVICE="adminer elasticsearch certbot mailhog" - - PHP_VERSION=70 BUILD_SERVICE="adminer elasticsearch certbot mailhog" - - PHP_VERSION=71 BUILD_SERVICE="adminer elasticsearch certbot mailhog" - - - PHP_VERSION=56 BUILD_SERVICE="selenium jenkins" - - PHP_VERSION=70 BUILD_SERVICE="selenium jenkins" - - PHP_VERSION=71 BUILD_SERVICE="selenium jenkins" - - - PHP_VERSION=56 BUILD_SERVICE="proxy proxy2 balancer" - - PHP_VERSION=70 BUILD_SERVICE="proxy proxy2 balancer" - - PHP_VERSION=71 BUILD_SERVICE="proxy proxy2 balancer" + - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog selenium jenkins proxy proxy2 balancer" - HUGO_VERSION=0.20.2 From e8aad1238eeec8e5b416535b42baaaa016492aab Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 17:37:03 +0800 Subject: [PATCH 4/9] join short time jobs --- .travis.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c192886..03e4e584 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ services: env: matrix: - - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" - - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" - - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2" + - 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=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace @@ -21,18 +21,10 @@ env: - PHP_VERSION=70 BUILD_SERVICE="php-worker hhvm" - PHP_VERSION=71 BUILD_SERVICE="php-worker hhvm" - - PHP_VERSION=56 BUILD_SERVICE="mysql mariadb phpmyadmin" - - PHP_VERSION=70 BUILD_SERVICE="mysql mariadb phpmyadmin" - - PHP_VERSION=71 BUILD_SERVICE="mysql mariadb phpmyadmin" - - PHP_VERSION=56 BUILD_SERVICE=mssql - PHP_VERSION=70 BUILD_SERVICE=mssql - PHP_VERSION=71 BUILD_SERVICE=mssql - - PHP_VERSION=56 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" - - PHP_VERSION=70 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" - - PHP_VERSION=71 BUILD_SERVICE="postgres postgres-postgis pgadmin neo4j mongo redis" - - PHP_VERSION=56 BUILD_SERVICE=rethinkdb - PHP_VERSION=70 BUILD_SERVICE=rethinkdb - PHP_VERSION=71 BUILD_SERVICE=rethinkdb From 9f12f63aeae78f8235891e993304e6e0fbf799f3 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 14:17:44 +0800 Subject: [PATCH 5/9] php-fpm Dockerfile-70 remove duplicate MSSQL section. --- php-fpm/Dockerfile-70 | 80 ------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 1c7a1b2c..824483f2 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -205,86 +205,6 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ docker-php-ext-install tokenizer \ ;fi -##################################### -# SQL SERVER: -##################################### - -ARG MSSQL=false -RUN if [ ${MSSQL} = true ]; then \ - - ##################################### - # Install Depenencies: - ##################################### - apt-get update && \ - apt-get install -y --force-yes wget apt-transport-https curl freetds-common php5-odbc libsybdb5 freetds-bin unixodbc unixodbc-dev php5-sybase && \ - - ##################################### - # The following steps were taken from - # Microsoft's github account: - # https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways - ##################################### - - # Add PHP 7 repository - # for Debian jessie - # And System upgrade - echo "deb http://packages.dotdeb.org jessie all" \ - | tee /etc/apt/sources.list.d/dotdeb.list \ - && wget -qO- https://www.dotdeb.org/dotdeb.gpg \ - | apt-key add - \ - && apt-get update \ - && apt-get upgrade -qq && \ - - # Install UnixODBC - # Compile odbc_config as it is not part of unixodbc package - apt-get install -y whiptail \ - unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \ - && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \ - && cd unixodbc-*/ \ - && dpkg-buildpackage -uc -us -B -d \ - && cp -v ./exe/odbc_config /usr/local/bin/ && \ - - # Fake uname for install.sh - printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \ - | tee /usr/local/bin/uname \ - && chmod +x /usr/local/bin/uname && \ - - # Microsoft ODBC Driver 13 for Linux - # Note: There's a copy of this tar on my hubiC - wget -nv -O msodbcsql-13.0.0.0.tar.gz \ - "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \ - && tar -xf msodbcsql-13.0.0.0.tar.gz \ - && cd msodbcsql-*/ \ - && ldd lib64/libmsodbcsql-13.0.so.0.0 \ - && ./install.sh install --accept-license \ - && ls -l /opt/microsoft/msodbcsql/ \ - && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" \ - - ##################################### - # Install pdo_dblib - ##################################### - - && docker-php-ext-install pdo \ - && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \ - && docker-php-ext-install pdo_dblib \ - && docker-php-ext-enable pdo_dblib && \ - - ##################################### - # Install sqlsrv y pdo_sqlsrv - # extensions: - ##################################### - - pecl install sqlsrv-4.1.7preview && \ - pecl install pdo_sqlsrv-4.1.7preview && \ - - ##################################### - # Set locales for the container - ##################################### - - apt-get install -y locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ -;fi - ##################################### # Human Language and Character Encoding Support: ##################################### From cf30e159fb0c534cf6aef3fb0c54213173b092b9 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 14:21:56 +0800 Subject: [PATCH 6/9] php-fpm Dockerfile-70 fix ini file path --- php-fpm/Dockerfile-70 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 824483f2..24b92f29 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -303,8 +303,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ apt-get install -y locales \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && echo "extension=sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-sqlsrv.ini \ - && echo "extension=pdo_sqlsrv.so" > /etc/php/7.0/cli/conf.d/20-pdo_sqlsrv.ini \ + && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ + && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \ ;fi # @@ -313,7 +313,7 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ #-------------------------------------------------------------------------- # -ADD ./laravel.ini /usr/local/etc/php/conf.d +ADD ./laravel.ini /usr/local/etc/php/conf.d/ ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* From a6e2a6ee59983fb0108833263637d14f596d6759 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 14:23:03 +0800 Subject: [PATCH 7/9] php-fpm Dockerfile-70 MYSQL install stable version --- php-fpm/Dockerfile-70 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 24b92f29..91c6f524 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -293,8 +293,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ # extensions: ##################################### - pecl install sqlsrv-4.1.7 && \ - pecl install pdo_sqlsrv-4.1.7 && \ + pecl install sqlsrv-4.0.8 && \ + pecl install pdo_sqlsrv-4.0.8 && \ ##################################### # Set locales for the container From 02958c06fe419d67579fcded3ac406ea341f3730 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 14:35:40 +0800 Subject: [PATCH 8/9] php-fpm Dockerfile-71 MYSQL * remove old section * fill new section --- php-fpm/Dockerfile-71 | 155 ++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 80 deletions(-) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 17e87d2b..9cb54cd9 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -205,86 +205,6 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ docker-php-ext-install tokenizer \ ;fi -##################################### -# SQL SERVER: -##################################### - -ARG MSSQL=false -RUN if [ ${MSSQL} = true ]; then \ - - ##################################### - # Install Depenencies: - ##################################### - apt-get update && \ - apt-get install -y --force-yes wget apt-transport-https curl freetds-common php5-odbc libsybdb5 freetds-bin unixodbc unixodbc-dev php5-sybase && \ - - ##################################### - # The following steps were taken from - # Microsoft's github account: - # https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways - ##################################### - - # Add PHP 7 repository - # for Debian jessie - # And System upgrade - echo "deb http://packages.dotdeb.org jessie all" \ - | tee /etc/apt/sources.list.d/dotdeb.list \ - && wget -qO- https://www.dotdeb.org/dotdeb.gpg \ - | apt-key add - \ - && apt-get update \ - && apt-get upgrade -qq && \ - - # Install UnixODBC - # Compile odbc_config as it is not part of unixodbc package - apt-get install -y whiptail \ - unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \ - && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \ - && cd unixodbc-*/ \ - && dpkg-buildpackage -uc -us -B -d \ - && cp -v ./exe/odbc_config /usr/local/bin/ && \ - - # Fake uname for install.sh - printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \ - | tee /usr/local/bin/uname \ - && chmod +x /usr/local/bin/uname && \ - - # Microsoft ODBC Driver 13 for Linux - # Note: There's a copy of this tar on my hubiC - wget -nv -O msodbcsql-13.0.0.0.tar.gz \ - "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \ - && tar -xf msodbcsql-13.0.0.0.tar.gz \ - && cd msodbcsql-*/ \ - && ldd lib64/libmsodbcsql-13.0.so.0.0 \ - && ./install.sh install --accept-license \ - && ls -l /opt/microsoft/msodbcsql/ \ - && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" \ - - ##################################### - # Install pdo_dblib - ##################################### - - && docker-php-ext-install pdo \ - && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \ - && docker-php-ext-install pdo_dblib \ - && docker-php-ext-enable pdo_dblib && \ - - ##################################### - # Install sqlsrv y pdo_sqlsrv - # extensions: - ##################################### - - pecl install sqlsrv-4.1.7preview && \ - pecl install pdo_sqlsrv-4.1.7preview && \ - - ##################################### - # Set locales for the container - ##################################### - - apt-get install -y locales \ - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ -;fi - ##################################### # Human Language and Character Encoding Support: ##################################### @@ -312,6 +232,81 @@ RUN if [ ${INSTALL_GHOSTSCRIPT} = true ]; then \ ghostscript \ ;fi +##################################### +# SQL SERVER: +##################################### +ARG INSTALL_MSSQL=false +ENV INSTALL_MSSQL ${INSTALL_MSSQL} + +RUN if [ ${INSTALL_MSSQL} = true ]; then \ + ##################################### + # Install Depenencies: + ##################################### + apt-get update && \ + apt-get install -y --force-yes wget apt-transport-https curl freetds-common libsybdb5 freetds-bin unixodbc unixodbc-dev && \ + + ##################################### + # The following steps were taken from + # Microsoft's github account: + # https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-getting-pdo_sqlsrv-for-PHP-7.0-on-Debian-in-3-ways + ##################################### + + # Add PHP 7 repository + # for Debian jessie + # And System upgrade + echo "deb http://packages.dotdeb.org jessie all" \ + | tee /etc/apt/sources.list.d/dotdeb.list \ + && wget -qO- https://www.dotdeb.org/dotdeb.gpg \ + | apt-key add - \ + && apt-get update \ + && apt-get upgrade -qq && \ + + # Install UnixODBC + # Compile odbc_config as it is not part of unixodbc package + apt-get update && \ + apt-get install -y whiptail \ + unixodbc libgss3 odbcinst devscripts debhelper dh-exec dh-autoreconf libreadline-dev libltdl-dev \ + && dget -u -x http://http.debian.net/debian/pool/main/u/unixodbc/unixodbc_2.3.1-3.dsc \ + && cd unixodbc-*/ \ + && ./configure && make && make install \ + && cp -v ./exe/odbc_config /usr/local/bin/ && \ + + # Fake uname for install.sh + printf '#!/bin/bash\nif [ "$*" == "-p" ]; then echo "x86_64"; else /bin/uname "$@"; fi' \ + | tee /usr/local/bin/uname \ + && chmod +x /usr/local/bin/uname && \ + + # Microsoft ODBC Driver 13 for Linux + # Note: There's a copy of this tar on my hubiC + wget -nv -O msodbcsql-13.0.0.0.tar.gz \ + "https://meetsstorenew.blob.core.windows.net/contianerhd/Ubuntu%2013.0%20Tar/msodbcsql-13.0.0.0.tar.gz?st=2016-10-18T17%3A29%3A00Z&se=2022-10-19T17%3A29%3A00Z&sp=rl&sv=2015-04-05&sr=b&sig=cDwPfrouVeIQf0vi%2BnKt%2BzX8Z8caIYvRCmicDL5oknY%3D" \ + && tar -xf msodbcsql-13.0.0.0.tar.gz \ + && cd msodbcsql-*/ \ + && ldd lib64/libmsodbcsql-13.0.so.0.0 \ + && ./install.sh install --accept-license \ + && ls -l /opt/microsoft/msodbcsql/ \ + && odbcinst -q -d -n "ODBC Driver 13 for SQL Server" && \ + + + ##################################### + # Install sqlsrv y pdo_sqlsrv + # extensions: + ##################################### + + pecl install sqlsrv-4.0.8 && \ + pecl install pdo_sqlsrv-4.0.8 && \ + + ##################################### + # Set locales for the container + ##################################### + + apt-get install -y locales \ + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ + && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ + && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 59293d7a9913b2143bc2007f0f72e9a41f7f981a Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sat, 6 May 2017 18:48:44 +0800 Subject: [PATCH 9/9] set php-fpm and workspace use sam sqlsrv version. --- workspace/Dockerfile-70 | 4 ++-- workspace/Dockerfile-71 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index f5dc718f..b4b7af32 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -458,8 +458,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ # extensions: ##################################### - pecl install sqlsrv-4.0.6 && \ - pecl install pdo_sqlsrv-4.0.6 && \ + pecl install sqlsrv-4.0.8 && \ + pecl install pdo_sqlsrv-4.0.8 && \ ##################################### # Set locales for the container diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 6d4ee3f2..f6ad96fb 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -454,8 +454,8 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ # extensions: ##################################### - pecl install sqlsrv-4.0.6 && \ - pecl install pdo_sqlsrv-4.0.6 && \ + pecl install sqlsrv-4.0.8 && \ + pecl install pdo_sqlsrv-4.0.8 && \ ##################################### # Set locales for the container