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

374 Commits

Author SHA1 Message Date
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
Max Mekenya 8ee2229c84 intl support 2017-03-16 09:59:05 +10:00
Ignacio Cabrera 9c14954ff4 Adding GHOSTSCRIPT support 2017-03-14 10:59:38 -03:00
Ignacio Cabrera 1250668267 Adding MSSQL Support 2017-03-14 10:47:10 -03:00
Marius van Zundert 36fcc6674e Seperated mysqli and tokenizer as seperate options without putting them under code igniter 2017-03-09 09:29:07 +01:00
Marius van Zundert 7a343f168f Updated with laradock master 2017-03-08 16:08:42 +01:00
alchimik 94c6240586 workaround for 'Xdebug breaks on access to class static property' (#654) 
see https://github.com/docker-library/php/issues/133
 2017-03-08 00:15:46 -05:00
Marius van Zundert 603010cbd5 Split up mysqli and tokenizer 2017-03-06 09:03:12 +01:00
alchimik 9cb902a819 fix php warning in php-fpm: "Unable to load dynamic library aerospike" (#622) 
* fix php warning in php-fpm: "Unable to load dynamic library aerospike"

* 	fix php warning in php-fpm: "Unable to load dynamic library aerospike"

* simplify solution

* Update Dockerfile-56

* Update Dockerfile-70
 2017-02-25 11:11:45 +08:00
alchimik cdaa344321 Fixed memcached for php5.6 (#624) 
```
Step 15/32 : RUN if [ ${INSTALL_MEMCACHED} = true ]; then     pecl install memcached &&     docker-php-ext-enable memcached ;fi
 ---> Running in b43e2e6b07f6
pecl/memcached requires PHP (version >= 7.0.0), installed version is 5.6.24
pecl/memcached can optionally use PHP extension "igbinary" (version >= 2.0)
pecl/memcached can optionally use PHP extension "msgpack" (version >= 2.0)
No valid packages found
install failed
ERROR: Service 'php-fpm' failed to build: The command '/bin/sh -c if [ ${INSTALL_MEMCACHED} = true ]; then     pecl install memcached &&     docker-php-ext-enable memcached ;fi' returned a non-zero code: 1
```
 2017-02-21 23:23:30 +08:00
alchimik 7b542618f0 Update opcache.ini 2017-02-19 13:26:18 +08:00
Simon Perdrisat 21a83bd5a3 safer opcache settings (#604) 2017-02-10 15:37:03 -05:00
Austin Benesh cf34c4ed32 Fixed SOAP for both php-fpm and CLI 2017-02-07 15:21:30 -07:00
choirudin a94f08920a add php exif (#564) 
* add php exif

* format
 2017-01-22 12:20:27 +08:00
FalAngelSt ad5883cdfd fixed redis php extension instalation bug 
remove unnecessary RUN command
 2017-01-13 15:53:23 +02:00
管宜尧 a8120a1c46 bugfix for phpredis configuration 
bugfix for phpredis configuration
 2017-01-13 15:06:35 +08:00
g0ld3lux f1cd4bb0e2 added phpredis in dockerfile70 (#546) 2017-01-12 19:06:08 -05:00
Mahmoud Zalt 860af556e2 Support bcmath php extention on php-fpm and workspace (base image 1.3) 
Probably closes #453
 2016-12-21 14:01:51 -05:00
Cosmos Pham 5bb515751a Fix PHP 5.6 Dockerfile syntax error 
Syntax error: ";" unexpected
 2016-12-20 13:20:53 +07:00
Austin Benesh da6b950623 Added SOAP option to php-fpm install. 2016-12-15 12:13:27 -07:00
Vladimir Kireyko b401c517b2 Add dockerfile with php-fpm 7.1 2016-12-15 15:05:48 +02:00
Mahmoud Zalt 2ed09f42ca change workspace and php-fpm work directories 
making them compatible with multiple projects
 2016-10-31 19:28:25 -04:00
Mahmoud Zalt 6ee790c26d Add support for Codeigniter 2016-10-31 12:21:01 -04:00
Mahmoud Zalt 2e5d2a743c disable xdebug remote by default 2016-10-09 20:47:08 -04:00
Mahmoud Zalt 5635b47c6f refactor the workspace docker file 2016-10-09 20:27:03 -04:00
Mahmoud Zalt 56f422ade0 replace true parameters by false as the default 2016-10-09 20:05:33 -04:00
Mahmoud Zalt 5640bd963d Activating OpCache 
Closes #307
 2016-09-15 10:47:58 -04:00
Luciano Gonçalves 6cc58de67e Add aerospike extension installation on phpfpm-56 as well 2016-09-04 14:50:03 +01:00
Luciano Gonçalves a3039958e3 Fix conflicts 2016-09-01 13:23:40 +01:00
Eric Pfeiffer 314e43bb79 Update Dockerfile-56 2016-08-28 00:04:52 -05:00
Eric Pfeiffer ea047e2587 remove unnecessary env commands 
These environment variables are not needed since they are only being used at build time and we are already specifying them using the ARG command, no need to specify it twice since it increases build time and size.
 2016-08-28 00:04:19 -05:00
Luciano Gonçalves 1afad7f14c Add configuration to install aerospike php extension 2016-08-20 19:05:38 +01:00
Mahmoud Zalt dd48592d8b update the xdebug.ini usage 2016-08-19 03:05:02 +03:00
Mahmoud Zalt d57a0c3888 rename and refactor xdebug config files 2016-08-19 03:03:45 +03:00
Tim Bracken cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Tim Bracken 95ef5e1e70 Add Drush and Opcache to laradock because they are needed for drupal development. 2016-08-16 15:13:58 -04:00
Mahmoud Zalt b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm 
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
 2016-08-16 15:13:42 +03:00
Mahmoud Zalt aabb0cded8 upgrade php-fpm base image 2016-08-16 15:12:52 +03:00
Mahmoud Zalt d3a6116a42 move PHP Memcached from the base image to LaraDock 2016-08-16 15:12:35 +03:00
Suteepat Damrongyingsupab a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Jack Fletcher 651430c7a9 Update Dockerfile-56 2016-08-15 15:01:47 +01:00
Jack Fletcher 3be9dee1c7 Update Dockerfile-70 2016-08-15 15:00:37 +01:00
Jack Fletcher 8ef37a71fb Remove hard-coded extensions from laravel.ini 2016-08-15 14:57:51 +01:00
Lialosiu 1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Mahmoud Zalt aa8f7c48a5 upgrade the php-fpm base images 2016-08-03 22:28:33 +03:00
Mahmoud Zalt 533925522c add CONTRIBUTING.md 2016-08-03 13:08:00 +03:00
Mahmoud Zalt e65f0dceba add docker build version to the base image 2016-07-27 04:34:45 +03:00
Mahmoud Zalt c792a780ee use laradock php-fpm base images 
to speed up the build time
 2016-07-27 04:22:31 +03:00
Mahmoud Zalt 5bb3d3b6a8 rename PHP-FPM Dockerfile5 to Dockerfile56 2016-07-27 03:57:32 +03:00
Mahmoud Zalt 462b5685eb add some comments sections to the php dockerfiles 2016-07-25 07:27:15 +03:00
Mahmoud Zalt e1dbb972f1 make Mongo, xDebug, Node, and prestissimo Installation Optional 
on the Workspace and PHP-FPM Containers

+ general refactoring
 2016-07-25 06:25:38 +03:00
Mahmoud Zalt 419434020c merge back apt-get update and install to keep them on the same layer 2016-07-25 04:05:07 +03:00
Mahmoud Zalt ca378ac734 add libz-dev library to php containers 2016-07-25 02:17:36 +03:00
Mahmoud Zalt 67f92de4f0 Refactor the PHP 5 Dockerfile 2016-07-25 02:14:19 +03:00
Mahmoud Zalt c8d4461771 Refactor the PHP 7 Dockerfile 2016-07-25 01:30:19 +03:00
Mahmoud Zalt 23b0906cd7 delete the Dockerfile-55 file and rename Dockerfile-56 to Dockerfile-5 
Since 5.5 and 5.6 dockerfiles are identical execept the base image php version.
Will let the users switch the php 5.6 and 5.5 version from the Dockerfile-5 by changing one char
in the first line. Removing this duplication will make contribution and maintance easier and faster.
 2016-07-24 23:25:31 +03:00
Eric Pfeiffer d75a43c615 Update Dockerfile-70 
fixes memcached extension not installing
 2016-07-16 13:07:56 -05:00
Bo-Yi Wu 16b82d066e #140 update php 5.5 and 5.6 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-07-14 09:56:05 +08:00
Yew JS 48a53f1d24 Update Dockerfile-70 
install libJPEG and enabled in GD
 2016-07-13 14:12:32 +08:00
Bo-Yi Wu e0b4734dab Added support upload file size setting. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-06-28 17:18:37 +08:00
Mahmoud Zalt de6db93da8 Fix conflict merging zhikiri-hotfix/mongo-support 2016-06-27 13:58:48 +03:00
zhikiri 62878e7c49 Added supporting of the mcrypt extenstion 2016-06-27 11:30:25 +03:00
Bo-Yi Wu 05c5fcf216 Support gd extension. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-06-16 14:57:27 +08:00
Mahmoud Zalt f3eb6a5fc4 Merge branch 'support-mongo' 
* support-mongo:
  add Mongo Support to the Readme
  added php-mongodb extension
  simple reformatting
  set the original volume path
  get mongo volum from the data container
  added mongodb driver for php5.5 5.6
  added mongodb image + PHP7 driver

Fix Conflicts in:
	docker-compose.yml
	php-fpm/Dockerfile-55
	php-fpm/Dockerfile-56
	php-fpm/Dockerfile-70
	php-fpm/laravel.ini
 2016-06-11 17:29:27 +03:00
Mahmoud Zalt bec1a32550 format the laravel.ini file 2016-06-03 15:01:56 +03:00
Bo-Yi Wu 1673a80daf clean apt source file after install. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-06-03 14:21:52 +08:00
Bo-Yi Wu f130381cfe install xdebug to generate coverage report for unit testing. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-06-03 14:04:33 +08:00
Mahmoud Zalt 124a3553e6 simple reformatting 2016-06-01 14:45:27 +03:00
Amin Mkh 1090bb4db6 added mongodb driver for php5.5 5.6 2016-05-30 23:26:40 +03:00
Amin Mkh 9c7054abe2 added mongodb image + PHP7 driver 2016-05-29 14:19:43 +03:00
Mahmoud Zalt 4edf941872 rename php to php-fpm 
preparing to add php cli as part of the workspace container
 2016-05-18 02:43:23 +03:00