f69422e82f
Merge branch 'master' into master
2017-04-12 00:53:43 -04:00
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
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
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
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
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
ad00284a22
Removing ext enable aerospike error
2017-04-12 00:35:11 +02:00
597f922db7
Update Dockerfile-70
2017-04-12 09:20:06 +12:00
cdb456a9b5
Fixing indentation
2017-04-11 23:19:58 +02:00
714902d12a
Moving php-fpm xdebug config to proper location
2017-04-11 23:17:21 +02:00
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
0594681760
Fixing the php ext already loaded warnings
...
Example:
```
warning: exif (exif.so) is already loaded!
```
2017-04-11 23:10:41 +02:00
f91def64d7
Fixing whitespaces and tailing spaces
2017-04-11 21:22:57 +02:00
86ebbfbdd3
Adding exif/redis to php-fpm 56 and 71
2017-04-11 20:48:42 +02:00
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
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
7dbe65e5f8
Bringing Dockerfile 71 up-to-date with 70
2017-04-11 16:47:38 +02:00
ef38dd1532
Fixing ghostscript env option
2017-04-11 16:45:20 +02:00
4b91fb1212
Fixing INTL ext in php-fpm for php71
2017-04-11 16:42:27 +02:00
80a60d58cf
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:22:07 +02:00
d321be888c
Fix PHP Zip library installation
2017-04-05 15:06:47 +02:00
e861348475
Adding option to install Php5.x MySQL #722
2017-04-04 16:39:53 +02:00
4973dd93be
Merge branch 'master' into master
2017-03-21 04:09:11 +07:00
9096737aa7
Merge pull request #694 from Mvzundert/master
...
Docker-71 and Nginx examples
2017-03-20 13:22:49 -04:00
134911843a
Merge branch 'master' into MSSQL_SUPPORT
2017-03-18 19:11:01 -03:00
2bbe39cf4a
Merge branch 'master' into master
2017-03-18 07:52:45 +07:00
516b148dae
Merge branch 'master' of github.com:laradock/laradock
2017-03-17 16:56:14 +01:00
0c53eadf34
docker-71 file now also works with new env-example setup
2017-03-17 16:55:53 +01:00
6054c2d250
Merge pull request #686 from cjmaxik/patch-3
...
Update Dockerfile-71
2017-03-17 11:08:29 -04:00
cee9de7ed1
Fix Dockerfile-70
...
Add ;fi to end if INSTALL_INTL block
2017-03-17 10:10:32 +01:00
2219177eac
Merge branch 'master' into master
2017-03-17 14:54:06 +07:00
5c0933d19a
Merge with master branch
2017-03-17 14:36:00 +07:00
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
4e443cec09
Merge branch 'master' into feature-intl
2017-03-17 10:08:21 +10:00
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
e10ba9fa9f
Merge pull request #617 from alchimik/patch-1
...
don't load opcache extension twice
2017-03-16 13:28:28 -04:00
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
8ee2229c84
intl support
2017-03-16 09:59:05 +10:00
9c14954ff4
Adding GHOSTSCRIPT support
2017-03-14 10:59:38 -03:00
1250668267
Adding MSSQL Support
2017-03-14 10:47:10 -03:00
36fcc6674e
Seperated mysqli and tokenizer as seperate options without putting them under code igniter
2017-03-09 09:29:07 +01:00
7a343f168f
Updated with laradock master
2017-03-08 16:08:42 +01:00
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
603010cbd5
Split up mysqli and tokenizer
2017-03-06 09:03:12 +01:00
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
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
7b542618f0
Update opcache.ini
2017-02-19 13:26:18 +08:00
21a83bd5a3
safer opcache settings ( #604 )
2017-02-10 15:37:03 -05:00
cf34c4ed32
Fixed SOAP for both php-fpm and CLI
2017-02-07 15:21:30 -07:00
a94f08920a
add php exif ( #564 )
...
* add php exif
* format
2017-01-22 12:20:27 +08:00
Mahmoud Zalt