ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,349 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

1349 Commits

Author SHA1 Message Date
Mahmoud Zalt c78eb5228a Merge pull request #803 from activeobjects/master 
Added support for jenkins official container
 2017-04-13 11:48:57 -04:00
Steve Walker 81053c0868 Added support for jenkins official container 2017-04-12 15:54:42 +00:00
Winfried b1367d237f Merge pull request #800 from chrissiboi/master 
Update Dockerfile-70
 2017-04-12 10:19:34 +02:00
Crispy 603207cc2b Update Dockerfile-70 
fixes a built crash because of an unexpected &&
 2017-04-12 10:17:06 +02:00
Mahmoud Zalt 43e2b3e403 Merge pull request #795 from hounded/master 
pdo_dblib
 2017-04-12 00:53:51 -04:00
Mahmoud Zalt f69422e82f Merge branch 'master' into master 2017-04-12 00:53:43 -04:00
Mike Erickson 96e82d4115 Merge pull request #793 from winfried-van-loon/php-fpm-56-args 
Fixing not-consumed buildargs php-fpm-56
 2017-04-11 18:36:13 -07:00
Mike Erickson 6d4a2c4cc4 Merge pull request #789 from winfried-van-loon/php-fpm-cleanup 
Fixing whitespaces and tailing spaces
 2017-04-11 18:35:17 -07:00
Mike Erickson f8e5f73e18 Merge pull request #794 from winfried-van-loon/xdebug-config 
Moving php-fpm xdebug config to proper location
 2017-04-11 18:35:03 -07:00
Mike Erickson cdc2811d7b Merge pull request #796 from winfried-van-loon/already-loaded-warnings 
Fixing the php ext already loaded warnings
 2017-04-11 18:34:45 -07:00
Mike Erickson 32d26c3e10 Merge pull request #799 from winfried-van-loon/787-workspace-soap-warning 
Fixing soap already loaded warning in workspace
 2017-04-11 18:33:37 -07:00
Mike Erickson b482d4d901 Merge pull request #783 from winfried-van-loon/php-fpm-71 
Bringing Dockerfile 71 up-to-date with 70
 2017-04-11 18:33:09 -07:00
Winfried ad00284a22 Removing ext enable aerospike error 2017-04-12 00:35:11 +02:00
Winfried a835c9e709 Fixing soap already loaded warning in workspace 2017-04-12 00:28:54 +02:00
James Whiteman 597f922db7 Update Dockerfile-70 2017-04-12 09:20:06 +12:00
Winfried cdb456a9b5 Fixing indentation 2017-04-11 23:19:58 +02:00
Winfried 714902d12a Moving php-fpm xdebug config to proper location 2017-04-11 23:17:21 +02:00
Winfried 657d8535a6 Fixing not-consumed buildargs php-fpm-56 
Should fix the following warning:
```
[Warning] One or more build-args [INSTALL_INTL INSTALL_PHPREDIS INSTALL_GHOSTSCRIPT] were not consumed
```
 2017-04-11 23:15:09 +02:00
Winfried 0594681760 Fixing the php ext already loaded warnings 
Example:
```
warning: exif (exif.so) is already loaded!
```
 2017-04-11 23:10:41 +02:00
Mike Erickson f5478cfef5 Merge pull request #790 from winfried-van-loon/645-php-fpm-ghostscript 
Fixing ghostscript env option
 2017-04-11 12:57:44 -07:00
Winfried e10217c64d Fixing ghostscript env option 
Forgot something :(.
 2017-04-11 21:52:34 +02:00
Winfried f91def64d7 Fixing whitespaces and tailing spaces 2017-04-11 21:22:57 +02:00
Mahmoud Zalt f991123545 Merge pull request #788 from laradock/575-php-fpm-exif 
Adding exif/redis to php-fpm 56 and 71
 2017-04-11 15:01:43 -04:00
Winfried 86ebbfbdd3 Adding exif/redis to php-fpm 56 and 71 2017-04-11 20:48:42 +02:00
Mahmoud Zalt a35287b367 Merge pull request #785 from winfried-van-loon/690-php-fpm-intl 
Fixing INTL ext in php-fpm for php71
 2017-04-11 13:24:43 -04:00
Mahmoud Zalt ddabb4620e Merge pull request #784 from winfried-van-loon/645-php-fpm-ghostscript 
Fixing ghostscript env option
 2017-04-11 13:24:29 -04:00
Mahmoud Zalt b86211d2d8 Merge pull request #781 from winfried-van-loon/764-780-php-fpm-mysql 
Merging removed MySQL ext into MySQLi setting
 2017-04-11 13:23:45 -04:00
Mahmoud Zalt 0b414813aa Merge pull request #777 from bestlong/patch-1 
use PHP71 build workspace get ERROR
 2017-04-11 13:23:33 -04:00
Winfried 7dbe65e5f8 Bringing Dockerfile 71 up-to-date with 70 2017-04-11 16:47:38 +02:00
Winfried ef38dd1532 Fixing ghostscript env option 2017-04-11 16:45:20 +02:00
Winfried 4b91fb1212 Fixing INTL ext in php-fpm for php71 2017-04-11 16:42:27 +02:00
Winfried 80a60d58cf Merging removed MySQL ext into MySQLi setting 2017-04-11 13:22:07 +02:00
Yu-Lung Shao (Allen) 1257f8830a use PHP71 build workspace get ERROR 
fix #752, has a wrong comment string
 2017-04-10 15:20:10 +08:00
Mike Erickson 8ed8bfdc2a Merge pull request #772 from winfried-van-loon/746-log-directories 
Adding log directories to prevent errors
 2017-04-09 18:56:47 -07:00
Mike Erickson 042eb9e5e8 Merge pull request #775 from bestlong/patch-1 
Fixing can't login to PHPMyAdmin
 2017-04-09 18:55:55 -07:00
Yu-Lung Shao (Allen) 15cac480fe Fixing can't login to PHPMyAdmin 
fix #754, login to PHPMyAdmin get "#2005 - Unknown MySQL server host 'mysql' (-2)" error.
 2017-04-10 09:50:53 +08:00
Winfried 02e867c17d Adding log directories to prevent errors 2017-04-09 21:58:05 +02:00
Mike Erickson d51cd31ebc Merge pull request #770 from mikeerickson/bugfix/769-linuxbrew-deployer 
bugfix/769 fix linuxbrew, deployer configuration
 2017-04-09 11:45:10 -07:00
Mahmoud Zalt ea354cf035 Update readme add: Winfried van Loon as Admin 2017-04-09 14:43:46 -04:00
Mike Erickson 0d4bacecd8 bugfix/769 fix linuxbrew, deployer configuration 2017-04-09 11:42:44 -07:00
Mahmoud Zalt 86197c9b62 update docs: Improve docker speed on MAC using dinghy 2017-04-09 14:39:25 -04:00
Mahmoud Zalt f8fd92fb0a Merge pull request #766 from BrianDGLS/patch-1 
fix typo in README.md
 2017-04-09 12:26:41 -04:00
Brian Douglas 61b038e0d9 fix typo in README.md 2017-04-09 09:42:28 +01:00
Mahmoud Zalt 5b60b7ffb8 Merge pull request #760 from bestlong/patch-1 
fix php-fpm PHP56 can't enabled MySQL Support
 2017-04-07 11:27:39 -04:00
Mahmoud Zalt 6e1911bdd5 Merge pull request #758 from hounded/master 
MySQL fix
 2017-04-07 11:27:32 -04:00
Yu-Lung Shao (Allen) d376074936 fix #759, php-fpm can't enabled MySQL Support 
lost passthru parameter
 2017-04-07 15:14:15 +08:00
James Whiteman 64b985f005 Update docker-compose.yml 2017-04-07 14:27:15 +12:00
James Whiteman cc50339bcb Update docker-compose.yml 2017-04-07 14:25:40 +12:00
James Whiteman 8820501644 Update Dockerfile 2017-04-07 14:24:15 +12:00
James Whiteman 07021b01f4 Delete startup 2017-04-07 14:23:02 +12:00