Commit Graph

81 Commits

Author SHA1 Message Date
Mahmoud Zalt
3a2845a00d Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Run apt-get update before installing intl extension
2017-04-20 13:55:21 -04:00
Mahmoud Zalt
fef6ec86b3 little cleanup 2017-04-20 13:55:09 -04:00
Mahmoud Zalt
c5105c29b6 Merge pull request #834 from xbojch/libicu-dev-not-found
Run apt-get update before installing intl extension
2017-04-20 13:46:02 -04:00
Mahmoud Zalt
4dda815980 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-20 13:45:04 -04:00
Bojan Bedrac
407353e6eb Run apt-get update before installing intl extension 2017-04-20 13:46:38 +02: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)
43f4f80836 Update Dockerfile-70
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
2017-04-14 10:08:44 +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
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
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
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
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
ef38dd1532 Fixing ghostscript env option 2017-04-11 16:45:20 +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
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