ZeroC0D3 Team 
							
						 
					 
					
						
						
							
						
						4973dd93be 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2017-03-21 04:09:11 +07:00 
						 
				 
			
				
					
						
							
							
								Ignacio Cabrera 
							
						 
					 
					
						
						
							
						
						134911843a 
					 
					
						
						
							
							Merge branch 'master' into MSSQL_SUPPORT  
						
						
						
						
					 
					
						2017-03-18 19:11:01 -03: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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Austin Benesh 
							
						 
					 
					
						
						
							
						
						da6b950623 
					 
					
						
						
							
							Added SOAP option to php-fpm install.  
						
						
						
						
					 
					
						2016-12-15 12:13:27 -07: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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						a3039958e3 
					 
					
						
						
							
							Fix conflicts  
						
						
						
						
					 
					
						2016-09-01 13:23:40 +01: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								larryeitel 
							
						 
					 
					
						
						
							
						
						d8a4537efb 
					 
					
						
						
							
							Provided a way to Stop/Start php-fpm xdebug via bash script.  
						
						
						
						
					 
					
						2016-08-15 09:28:32 -06:00 
						 
				 
			
				
					
						
							
							
								Jack Fletcher 
							
						 
					 
					
						
						
							
						
						3be9dee1c7 
					 
					
						
						
							
							Update Dockerfile-70  
						
						
						
						
					 
					
						2016-08-15 15:00:37 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Eric Pfeiffer 
							
						 
					 
					
						
						
							
						
						d75a43c615 
					 
					
						
						
							
							Update Dockerfile-70  
						
						... 
						
						
						
						fixes memcached extension not installing 
						
						
					 
					
						2016-07-16 13:07:56 -05:00 
						 
				 
			
				
					
						
							
							
								Yew JS 
							
						 
					 
					
						
						
							
						
						48a53f1d24 
					 
					
						
						
							
							Update Dockerfile-70  
						
						... 
						
						
						
						install libJPEG and enabled in GD 
						
						
					 
					
						2016-07-13 14:12:32 +08:00 
						 
				 
			
				
					
						
							
							
								Mahmoud Zalt 
							
						 
					 
					
						
						
							
						
						de6db93da8 
					 
					
						
						
							
							Fix conflict merging zhikiri-hotfix/mongo-support  
						
						
						
						
					 
					
						2016-06-27 13:58:48 +03:00