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

221 Commits

Author SHA1 Message Date
nymd fad7c11d53
laravel timeouts 2018-01-29 16:32:18 -08:00
Zgoo f27b3aa4be
Remove blank lines 
Just do it to avoid Warning message on building the php-fpm container
 2018-01-12 02:04:02 +08:00
Zgoo 722f7d09c0
Remove blank lines 
Just do it to avoid Warning message on building the php-fpm container
 2018-01-12 01:43:25 +08:00
Mahmoud Zalt d098f1f6ad
Merge pull request #1322 from jk2K/master 
feat: add GMP extension to PHP-fpm
 2018-01-09 19:22:19 +01:00
Fruty 5efda6714b Update apt packages to install librabbitmq for php 7.0 and php 5.6 2017-12-29 16:02:46 +02:00
Fruty a83477b439 Added packages update to install librabbit-mq. 2017-12-29 14:25:43 +02:00
Fruty 0aaa2c742e Added support for AMQP extension in workspace and php-fpm containers. 2017-12-28 14:25:32 +02:00
yemeng1 0445d76d11 feat: add GMP extension to PHP-fpm 2017-12-27 18:56:26 +08:00
Mahmoud Zalt 71cc109334 update base tags 2017-12-17 21:31:37 +01:00
Mahmoud Zalt 0d804cd29a enable remote_connect_back instead of defining remote host in xdebug 
and modify the default var display
 2017-12-17 21:31:05 +01:00
Shao Yu Lung a2ae141a75 fix aerospike build fail 2017-12-10 15:10:41 +08:00
Mahmoud Zalt 46852bc31b
Merge pull request #1232 from zuohuadong/patch-17 
Update Dockerfile-71
 2017-11-08 05:24:42 +02:00
zuohuadong 5835d185f2
Update Dockerfile-71 
Remove duplicate configuration.
 2017-11-07 10:53:26 +08:00
zuohuadong 4fc85d499d
Update Dockerfile-70 
Remove duplicate configuration
 2017-11-07 10:52:23 +08:00
Thorvald Falkenburg f4ede08b9c Fix variable issues. 
Also made the variables introduced with the psql client consistent
with the existing ones. Fixes #1208
 2017-10-25 11:40:47 +02:00
Lan Dong Si Hoang (Geraint Dong) 60998ed1e4 Merge branch 'master' into Add_pg_client_to_workspace_phpfpm 2017-10-24 13:03:56 +07:00
Geraint Dong ee03bb607f Add support for pgclient to workspace & php-fpm 2017-10-18 10:04:23 +07:00
Zuohuadong 7f5d9d07d1 add postgresql for php-fpm 2017-10-17 12:23:48 +08:00
Zuohuadong 17ea7b313f update 2017-10-12 18:54:09 +08:00
Geraint Dong 3cc917c9de Add Postgre SQL Support for php-fpm & edit webserver session storage location 2017-09-25 17:30:30 +07:00
luciano 998aa1365e Add aerospike.so line to be load on php-fpm 2017-09-22 12:23:20 +01:00
Arhey 5c5f94600a Rename laravel.pool.conf to xlaravel.pool.conf 
Fix issue #1011
 2017-09-06 00:22:18 +03:00
Arhey b2e372054f Fixed php-fpm build 2017-09-05 23:36:30 +03:00
Arhey 0a23d53ee5 Move php-imagick to php-fpm and enable it 2017-09-05 21:47:47 +03:00
Arhey f6552aca97 Added support of ImageMagick to php-fpm 2017-09-05 21:09:34 +03:00
Eugene Kirdzei a36620c3bd Restart build 2017-09-04 12:05:34 +03:00
Eugene Kirdzei cddc934e1e Fix phpreddis installation for all versions of php 2017-09-04 11:33:14 +03:00
Eugene Kirdzei 53b3ad0f7e Fix Php Redis extension installation 2017-08-31 19:29:19 +03:00
Ujjwal Ojha 9dda2f6b9f image optimizers libraries 2017-07-10 18:49:39 +05:45
mycontroller 0290142bf4 Dockerfile-56 fill missing MSSQL section 2017-05-31 13:41:30 +08:00
Shao Yu Lung 5a8df95fd3 fixing PHP7.0 php-fpm mssql extension build failed 2017-05-20 10:35:41 +08:00
Shao Yu Lung 43545cefd2 fixing PHP7.1 php-fpm mssql extension build failed 2017-05-20 09:20:00 +08:00
Yu-Lung Shao (Allen) 71364f962e fix php-fpm show warning not install extension (#954) 2017-05-19 17:00:13 +08:00
Shao Yu Lung 848398d443 php-fpm service LDAP support 2017-05-12 19:23:03 +08:00
wxb 31d21c74a0 add swoole extension config 2017-05-08 01:42:46 +08:00
Winfried 3134221445 Fixing aerospike 2017-05-07 16:56:15 +02:00
Winfried 4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Shao Yu Lung f162864e89 apt-get update just need run at first, after add-apt-repository or update apt source list. 2017-05-07 01:17:35 +08:00
Shao Yu Lung 02958c06fe php-fpm Dockerfile-71 MYSQL 
* remove old section
* fill new section
 2017-05-06 17:44:32 +08:00
Shao Yu Lung a6e2a6ee59 php-fpm Dockerfile-70 MYSQL 
install stable version
 2017-05-06 17:44:32 +08:00
Shao Yu Lung cf30e159fb php-fpm Dockerfile-70 
fix ini file path
 2017-05-06 17:44:32 +08:00
Shao Yu Lung 9f12f63aea php-fpm Dockerfile-70 
remove duplicate MSSQL section.
 2017-05-06 17:44:31 +08:00
Shao Yu Lung a81686d9d0 aerospike-client-php version to 3.4.14 (php-fpm) 2017-05-05 19:13:10 +08:00
Mark Hilton e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes: 
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
 2017-05-03 13:01:03 -04:00
Winfried 5a5dceb967 Merge pull request #883 from laradock/843-sqlsrv-php71 
Add sqlsrv to php-fpm php71
 2017-05-02 15:29:45 +02:00
Winfried 02a512dd72 Dockerfile minor formatting 2017-05-01 22:20:25 +02:00
Winfried d5883e4bcf Adding sqlsrv to php-fpm PHP71 2017-05-01 22:19:09 +02:00
Winfried 5815549a9a Upgrading sqlsrv to version without error 2017-05-01 22:17:29 +02:00
Winfried 49f245b37a Add apt update to intl intall 
Fixes #847
 2017-04-23 21:29:18 +02:00
Mahmoud Zalt 0b11b874d2 add php71.ini 2017-04-21 23:51:52 -04:00
Mahmoud Zalt b1c546efc9 update base images version for workspace and php-fpm 2017-04-21 22:37:48 -04:00
Bojan Bedrac 5c95bb3a0f Run apt-get update before installing intl extension 2017-04-21 10:13:53 +12:00
Mahmoud Zalt bce05e4b59 little cleanup 2017-04-21 10:13:53 +12:00
Mahmoud Zalt 4ce1d7f64a upgrade base images for php-fpm and workspace. 
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
 2017-04-21 10:13:53 +12:00
Diego Antunes 5aab3add44 Added blackfire.io 2017-04-21 10:02:54 +12:00
wxb f14b3b32cf add php.ini file 2017-04-16 19:33:27 +08:00
Mahmoud Zalt f3598c3c97 Merge pull request #805 from bestlong/fixing-php-fpm-ghostscript 
Fixing php fpm ghostscript
 2017-04-14 03:24:54 -04:00
Mahmoud Zalt 4fd73ac512 Fix build error in php-fpm containers, after updating the base image 2017-04-14 03:23:19 -04:00
Mahmoud Zalt 747f956d01 update php-fpm base image tags {requires rebuild} 2017-04-14 03:12:00 -04:00
Yu-Lung Shao (Allen) 1519d2c64c Update Dockerfile-71 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:09:44 +08:00
Yu-Lung Shao (Allen) 43f4f80836 Update Dockerfile-70 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:08:44 +08:00
Yu-Lung Shao (Allen) ca7726c441 Update Dockerfile-56 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:08:11 +08:00
Crispy 603207cc2b Update Dockerfile-70 
fixes a built crash because of an unexpected &&
 2017-04-12 10:17:06 +02: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 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
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
Winfried f91def64d7 Fixing whitespaces and tailing spaces 2017-04-11 21:22:57 +02: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
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
david-perez d321be888c Fix PHP Zip library installation 2017-04-05 15:06:47 +02:00
Winfried e861348475 Adding option to install Php5.x MySQL #722 2017-04-04 16:39:53 +02:00
ZeroC0D3 Team 4973dd93be Merge branch 'master' into master 2017-03-21 04:09:11 +07:00
Mahmoud Zalt 9096737aa7 Merge pull request #694 from Mvzundert/master 
Docker-71 and Nginx examples
 2017-03-20 13:22:49 -04:00
Ignacio Cabrera 134911843a Merge branch 'master' into MSSQL_SUPPORT 2017-03-18 19:11:01 -03:00
ZeroC0D3 Team 2bbe39cf4a Merge branch 'master' into master 2017-03-18 07:52:45 +07:00
Marius van Zundert 516b148dae Merge branch 'master' of github.com:laradock/laradock 2017-03-17 16:56:14 +01:00
Marius van Zundert 0c53eadf34 docker-71 file now also works with new env-example setup 2017-03-17 16:55:53 +01:00
Mahmoud Zalt 6054c2d250 Merge pull request #686 from cjmaxik/patch-3 
Update Dockerfile-71
 2017-03-17 11:08:29 -04:00
David Táboas cee9de7ed1 Fix Dockerfile-70 
Add ;fi to end if INSTALL_INTL block
 2017-03-17 10:10:32 +01:00
ZeroC0D3 Team 2219177eac Merge branch 'master' into master 2017-03-17 14:54:06 +07:00
ZeroC0D3 Team 5c0933d19a Merge with master branch 2017-03-17 14:36:00 +07:00
Max Mekenya c6e393f5ce Update Dockerfile-71 
We have already 7.1 image builded. + intl and ghostscript support 
https://github.com/laradock/laradock/pull/672
https://github.com/laradock/laradock/pull/680
 2017-03-17 10:32:04 +10:00
Max Mekenya 4e443cec09 Merge branch 'master' into feature-intl 2017-03-17 10:08:21 +10:00
Mahmoud Zalt c00fe5d7e0 Merge branch 'multiple-projects-improvement' 
* multiple-projects-improvement:
  updated env-example and removed .env.example
  complete missings
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
 2017-03-16 16:10:28 -04:00
Mahmoud Zalt e10ba9fa9f Merge pull request #617 from alchimik/patch-1 
don't load opcache extension twice
 2017-03-16 13:28:28 -04:00
Mahmoud Zalt 0678415663 Merge pull request #484 from AliveCorpse/feature/php_fpm_v7.1 
Add dockerfile with php-fpm 7.1
 2017-03-16 13:26:14 -04:00