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
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