Commit Graph

417 Commits

Author SHA1 Message Date
mouyong
ab3a325ea3 fix apt install fail 2019-08-09 13:11:03 +08:00
mouyong
b8a971e634 fix in aliyun mirrors, hash check error. 2019-08-09 09:26:40 +08:00
mouyong
4893347980 remove setting remote_log 2019-08-09 09:14:10 +08:00
mouyong
f01cab7742 set xdebug.remote_autostart=0 https://github.com/laradock/laradock/issues/2112#issuecomment-489603086 2019-08-09 09:08:49 +08:00
mouyong
f64adc2114 workspace and php-fpm change source 2019-08-09 08:52:32 +08:00
Alec Joy
ff640a0ca2
Use docker command to enable pcov 2019-08-05 10:45:12 -04:00
Alec Joy
bdf2a285a7
Typo in PHP Version check 2019-08-05 09:54:15 -04:00
Alec Joy
b2de93cc1b Add support for pcov code coverage driver 2019-08-04 14:07:05 -04:00
蔡正海
51c6d3549c fix: fix install xhprof error (#2141)
* feat: Add PHP_FPM_INSTALL_XHPROF as an option to install xhprof extension
* fix: INSTALL_XHPROF default value set false
* fix: install xhprof error
* fix: nginx build
* fix: when INSTALL_XHPROF = false, rm xhprof.ini
2019-07-30 12:47:43 +08:00
Stefan Neuhaus
044261b06f Implement Gearman Message broker & PHP Extension 2019-07-25 12:03:21 +02:00
Feng Hao
768f14b6dd fix: apt error after imap installed (#2212) 2019-07-24 21:06:36 +08:00
Takafumi Enomoto
db1a7cdbbc Add memcached extension support for PHP 7.3 (#2195) 2019-07-22 22:28:39 +08:00
Rex Tsou
f73a66da13 Fix php-fpm build fail (php5)
pecl redis no longer support php5
2019-07-04 15:05:03 +08:00
skipworkgh
e9eacfafa7 Added support for the mailparse php pecl extension 2019-07-02 16:12:05 +02:00
vlauciani
5bf8be6303 Add 'sshpass' and 'ping' packages into 'workspace' and 'php-fpm' Docker image (#2164)
* Update env-example
Added variables to install 'ping' and 'sshpass'
* Update docker-compose.yml
Import variable from '.env' to set 'INSTALL_MYSQL_CLIENT' and 'INSTALL_PING'
* Update Dockerfile
Add code to import variables from 'docker-compose.yml' to install 'ping' and/or 'sshpass'
2019-06-06 11:59:13 +08:00
xiagw
bc8772441b add php ext "taint" (#2150)
* add php ext "taint", only support php7.
2019-05-29 08:56:40 +08:00
蔡正海
fbdfc41927 feat: Add PHP_FPM_INSTALL_XHPROF as an option to install xhprof extension (#2077)
* feat: Add PHP_FPM_INSTALL_XHPROF as an option to install xhprof extension
* fix: INSTALL_XHPROF default value set false
2019-05-18 10:57:01 +08:00
Tunde Aromire
4417083a80 Installation of ffmpeg (#2118)
* Install ffmpeg in workspace and php-worker.
2019-05-08 22:27:39 +08:00
Silvio Ney
0980523049 POSTGIS Postgres Extension (#2110)
* created PHP_FPM_INSTALL_POSTGIS variable
* install postgis if needs
* install_postgis variable
2019-05-08 18:17:08 +08:00
Rainer Eli
d8b3cb5a52 Add PHP_FPM_INSTALL_RDKAFKA as an option to install rdkafka extension (#2040) 2019-05-08 18:15:09 +08:00
Robert Fridzema
6f4664c579 Consistency fix (#2053)
Self explaining
2019-03-20 21:49:40 +08:00
Shao Yu-Lung (Allen)
329462a637
update base image (#2034) 2019-03-03 20:57:07 +08:00
Shao Yu-Lung (Allen)
76218808fd
Support PHP 7.3 (#2028)
* Support PHP 7.3
* travics-ci build test by pass:
  * SSH2 extension does not yet support PHP 7.3
  * V8JS extension does not yet support PHP 7.3.
  * xdebug extension does not yet support PHP 7.3.
  * memcached extension does not yet support PHP 7.3.
2019-03-01 18:24:14 +08:00
Shao Yu-Lung (Allen)
cf6a9ba2c9
php-fpm and workspace replace base image (#2025)
* php-fpm and workspace replace base image
* Aerospike PHP 5.6.40 Debian 9.6 is not supported, travis-ci build by pass.
2019-03-01 11:02:13 +08:00
Shao Yu-Lung (Allen)
61d7b18922
Optimize php-fpm and workspace Dockerfile. (#2015) 2019-02-23 16:46:46 +08:00
Shao Yu-Lung (Allen)
1ec9244f7f
Fix workspace php56 build fail (#2012)
* check swoole extenstion after install.
* php 5.6 install swoole-2.0.11 downgrade version to 2.0.10 avoid segmentation fault.
2019-02-23 00:52:14 +08:00
Shao Yu-Lung (Allen)
176d4e8033
php 7.0 php-fpm and workspace PECL install sqlsrv pdo_sqlsrv specify 5.3.0 version. (#2010) 2019-02-22 23:45:21 +08:00
Yu Li
2deb9bf1cb php-fpm install mysql-client (#2005) 2019-02-22 18:30:05 +08:00
Shao Yu-Lung (Allen)
b0edaf93a1
reorganizaion aerospike extension install (#2008) 2019-02-22 17:46:25 +08:00
Shao Yu-Lung (Allen)
27af2bca8c
fix install zip fail (#1998) 2019-02-17 01:19:20 +08:00
vladyslavstartsev
1282c413fd added zip to php-fpm workspace container (so there is no composer warning) (#1903) 2019-02-16 23:32:03 +08:00
scappuccino
ee2db98c61 xsl support added (feature for magento 2) (#1995)
* Update php-fpm Dockerfile
* Update workspace Dockerfile
* Update env-example
2019-02-16 23:03:42 +08:00
Ion Jaureguialzo Sarasola
1286b7ef06 Support for additional locales in PHP-FPM (#1976) 2019-02-14 21:52:40 +08:00
Lan Phan
b1e346383b fix php-fpm AMQP build for 5.6, 7.0 and 7.1 (#1965) 2019-02-09 16:33:06 +08:00
Shao Yu-Lung (Allen)
acac6eb229
fix PHP Warning: PHP Startup: Unable to load dynamic library 'phalcon.so' (#1947)
when install APCu and no install Phalcon.
2019-01-10 21:50:59 +08:00
Frank Yuan
04f071555c fixed php-fpm install phalcon ext bug (#1811)
* add phalcon ext
* fixed phalcon install
* update index.md
* php-worker install phalcon ext
2019-01-10 10:56:30 +08:00
Masahiro Ienaga
ce7a29c662 modify syntax error (#1942)
Syntax error in shell when installing APCU.
Because Fixed shell syntax.
fix #1943, #1940.
2019-01-09 21:22:42 +08:00
Pavel
e07c128063 Install socket extension for php-fpm (#1923)
In some case for pushing into queue you need use constant from sockets extension
2019-01-08 15:35:22 +08:00
Spyros Sakellaropoulos
e6d866b8a6 Added APCU installation option (#1831) 2019-01-08 15:30:12 +08:00
Michael Radionov
796b46cf5a PHP YAML extension (#1798) 2018-11-22 08:12:52 +08:00
Abdelrahman Omran
1dac382827 Drop the useless PHP tokenizer extension install step (#1650)
It is bundled and enabled by default in the PHP language already, and adding this step raises a warning:
warning: tokenizer (tokenizer.so) is already loaded!

Also if this option disabled, it's still installed as part of the language anyway!
2018-11-13 20:30:41 +08:00
Frank Yuan
9cfe5c6156 add phalcon ext (#1806)
* add phalcon ext
2018-09-22 15:45:41 +08:00
Shao Yu-Lung (Allen)
db02fe7570
Fix Travis CI build failed (#1803)
php-fpm: Unable to locate package libfaketime
2018-09-18 21:44:36 +08:00
ganlei
00df369e96 Add IonCube Loader (zend_extension) (#1763) 2018-09-08 21:31:05 +08:00
vladyslavstartsev
39469e1404 added ssh2 to workspace and php-fpm (#1756) 2018-08-28 14:16:25 +08:00
Youri Westerman
89051de67d This developer needed to turn back the clock in the PHP-FPM container, you will not believe what he did next! (#1675)
* Added documentation for installing libfaketime in the php-fpm container
* Enabled installing and using libfaketime system-wide inside the php-fpm container
2018-08-21 13:41:34 +08:00
Shao Yu-Lung (Allen)
303dadf33d
fix ln: failed to create symbolic link: file exists. (#1735)
#1707
2018-07-29 12:42:13 +08:00
Shao Yu-Lung (Allen)
764e484599
Env variable conflict (#1734)
* php-fpm and workspace arg var rename: PHP_VERSION to  LARADOCK_PHP_VERSION.
* travis-ci skip phpbdg
2018-07-29 12:00:13 +08:00
Alex Mayer
1acbebc2a3 Update MSSQL Drivers To Newest Version (#1707)
Remove version lock from pecl install
Update to Debian 9 repos since our image is Debian 9
Remove duplicate locales-gen line
Closes #1622
2018-07-28 15:08:01 +08:00
Youri Westerman
4ce25e95b4 Added option to install the php calendar extension in php-fpm (#1672)
* Added option to install the php calendar extension in php-fpm
* Added section about installing php calendar extension in php-fpm
2018-07-13 18:31:13 +08:00
Eugene Kirdzei
a1e01ac19b Install phpdbg (#1612)
* Install phpdbg
* Change documentstion
2018-06-30 16:54:46 +08:00
Abdelrahman Omran
0351cf531b Fix minor syntax issue that solves "[/bin/sh: 1: [: missing ]" error (#1649) 2018-06-27 18:47:42 +08:00
Abdelrahman Omran
09e998b723 Fix missing apt-utils package (#1652) 2018-06-27 18:47:05 +08:00
Abdelrahman Omran
06d0105514 Fix PHP zip extension installation warnings (#1648)
This fixes the following warnings when installing "zip" php extension:
configure: WARNING: ========================================================
configure: WARNING: Use of bundled libzip is deprecated and will be removed.
configure: WARNING: Some features such as encryption and bzip2 are not available.
configure: WARNING: Use system library and --with-libzip is recommended.
configure: WARNING: ========================================================
2018-06-27 18:46:27 +08:00
Shao Yu-Lung (Allen)
0cbc51bf72
php-fpm ini file rename to match volume config format. (#1646)
volumes:
  - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
2018-06-25 23:03:23 +08:00
Shao Yu-Lung (Allen)
08dfc9f816
php-fpm, workspace when php5 support old mongo ext. (#1642) 2018-06-25 20:16:25 +08:00
Abdelrahman Omran
b71f50bf83 Fix apt-get deprecated --force-yes flag & noninteractive if needed (#1640) 2018-06-24 23:19:49 +08:00
Abdelrahman Omran
600a6154b4 Automate xdebug installation and simplify instructions (#1630) 2018-06-24 09:46:12 +08:00
bestlong
a3cbfd71f5 Fix php7.0 swoole build failed. 2018-06-18 21:27:23 +08:00
bestlong
e8eb97b398 php5 support MSSQL extension 2018-06-11 14:23:40 +08:00
bestlong
34ad8acdbf php-fpm aerospike support php5 2018-06-01 11:02:20 +08:00
bestlong
ad21cd225f fix php 5.6 memcached build failed 2018-06-01 08:45:56 +08:00
bestlong
0f4a417f4e fix aerospike build failed
php-fpm and workspace
2018-06-01 01:30:35 +08:00
bestlong
d5efd5309e update pecl channel 2018-05-28 08:47:22 +08:00
bestlong
402383e7b7 Fix php5 Unable to locate gmp.h 2018-05-27 20:01:29 +08:00
Shao Yu-Lung (Allen)
9250326664
Swoole support php5 (#1571)
* php5 fpm support swoole
* php5 workspace support swoole
2018-05-27 19:47:13 +08:00
Shao Yu-Lung (Allen)
7c88c33b29
Merge pull request #1504 from dougblackjr/master
Adding pcntl to php-fpm, php-worker, addresses #1419
2018-05-27 10:08:53 +08:00
Shao Yu-Lung (Allen)
808bd72d13
Fix #1544, Unable to locate package libgmp-dev. (#1569)
* Fix #1544, Unable to locate package libgmp-dev.
2018-05-27 10:06:00 +08:00
bestlong
d1170f51c8 Fix install php ext SOAP No package php-soap available 2018-05-26 07:47:29 +08:00
bestlong
97adef735a fix #1535 xdebug installation fails when php version is 5.6 2018-05-26 07:32:33 +08:00
Douglas Black
6b6e2d5f86 Adding pcntl to php-fpm, php-worker, addresses #1419 2018-04-24 10:25:16 -04:00
Mahmoud Zalt
101986c76f merge the php versions dockerfiles in php-fpm, workspace and php-worker 2018-04-06 10:04:56 +03:00
Daniel Hunsaker
31a4e29c81 Apply COPY vs ADD best practices
Should only use `ADD` for URLs (and even then, `curl` or `wget` are preferred, for numerous reasons, even within this repo) and when extracting archive contents as part of the `ADD` operation; otherwise `COPY` is clearer and (slightly) more efficient.
2018-04-04 06:13:28 -06:00
Shao Yu Lung
cd849dda21 php-fpm sql server section: increase install check 2018-03-24 13:56:06 +08:00
Shao Yu Lung
5773d270ca clean up aerospike and empty line 2018-03-19 22:15:24 +08:00
Shao Yu Lung
70e10a4953 MAINTAINER is deprecated 2018-03-16 17:34:47 +08:00
Shao Yu Lung
ab9f5aba6e Update Dockerfile-72 2018-02-26 21:27:56 +08:00
Yu-Lung Shao (Allen)
43ba898df3
Merge branch 'master' into php-fpm-install-imap 2018-02-26 20:33:35 +08:00
Yu-Lung Shao (Allen)
e546c9c190
Update php72.ini (#1397) 2018-02-26 18:44:02 +08:00
Yu-Lung Shao (Allen)
27ec06bbf0
Merge pull request #1371 from oysterprotocol/change-php-settings
Change php settings
2018-02-26 16:46:21 +08:00
Yu-Lung Shao (Allen)
ca376935e1
Merge pull request #1382 from desaroger/php-72-pr
Add PHP 7.2 support and fix issues on 5.6-7.0-7.1 versions
2018-02-26 10:43:16 +08:00
desaroger
227bc37376 Fix MSSQL issue with a non-installed dependency 2018-02-23 22:26:13 +01:00
desaroger
74ca3b82a1 Fix issue installing Aerospike in php-fpm with php 7.2 2018-02-23 22:02:57 +01:00
desaroger
d23c553313 Fix installing PG client 2018-02-23 21:27:04 +01:00
Yu-Lung Shao (Allen)
715c2176b8
Merge pull request #1347 from zgoo/zgoo-laradock
Remove blank lines in php-fpm/Dockerfile70&71
2018-02-22 10:06:22 +08:00
desaroger
198c3906b2 Fix libgmp not locating gmp.h file 2018-02-17 09:50:16 +01:00
desaroger
76da02e779 Add PHP version checkers on all php-related dockerfiles 2018-02-17 09:26:46 +01:00
desaroger
92dda4695c Changes to make travis work, copied from spyridonas PR 2018-02-16 21:12:14 +01:00
desaroger
91131f0963 Add PHP 7.2 support 2018-02-16 18:40:13 +01:00
Sven Slijkoord
03c7611010
Update Dockerfile-56 2018-02-13 19:18:22 +01:00
Sven Slijkoord
48de39b1a1
Update Dockerfile-70 2018-02-13 19:18:07 +01:00
Sven Slijkoord
2ca9d3c5c6
Update Dockerfile-71 2018-02-13 19:17:31 +01:00
Shao Yu Lung
dfff0b2fa0 Fix pecl/swoole requires PHP (version >= 7.0.0) 2018-02-11 12:44:24 +08:00
R. L. Fornea
82a2681eed
Update php70.ini 2018-02-08 12:59:34 -05:00
R. L. Fornea
e792aa654e
Update php71.ini 2018-02-08 12:58:37 -05:00
nymd
f05fdc71d5
doubling memory limit for php on brokers 2018-01-31 16:46:45 -08:00
nymd
fad7c11d53
laravel timeouts 2018-01-29 16:32:18 -08:00
Zgoo
f27b3aa4be
Remove blank lines
Just do it to avoid Warning message on building the php-fpm container
2018-01-12 02:04:02 +08:00
Zgoo
722f7d09c0
Remove blank lines
Just do it to avoid Warning message on building the php-fpm container
2018-01-12 01:43:25 +08:00
Mahmoud Zalt
d098f1f6ad
Merge pull request #1322 from jk2K/master
feat: add GMP extension to PHP-fpm
2018-01-09 19:22:19 +01:00
Fruty
5efda6714b Update apt packages to install librabbitmq for php 7.0 and php 5.6 2017-12-29 16:02:46 +02:00
Fruty
a83477b439 Added packages update to install librabbit-mq. 2017-12-29 14:25:43 +02:00
Fruty
0aaa2c742e Added support for AMQP extension in workspace and php-fpm containers. 2017-12-28 14:25:32 +02:00
yemeng1
0445d76d11 feat: add GMP extension to PHP-fpm 2017-12-27 18:56:26 +08:00
Mahmoud Zalt
71cc109334 update base tags 2017-12-17 21:31:37 +01:00
Mahmoud Zalt
0d804cd29a enable remote_connect_back instead of defining remote host in xdebug
and modify the default var display
2017-12-17 21:31:05 +01:00
Shao Yu Lung
a2ae141a75 fix aerospike build fail 2017-12-10 15:10:41 +08:00
Mahmoud Zalt
46852bc31b
Merge pull request #1232 from zuohuadong/patch-17
Update Dockerfile-71
2017-11-08 05:24:42 +02:00
zuohuadong
5835d185f2
Update Dockerfile-71
Remove duplicate configuration.
2017-11-07 10:53:26 +08:00
zuohuadong
4fc85d499d
Update Dockerfile-70
Remove duplicate configuration
2017-11-07 10:52:23 +08:00
Thorvald Falkenburg
f4ede08b9c Fix variable issues.
Also made the variables introduced with the psql client consistent
with the existing ones. Fixes #1208
2017-10-25 11:40:47 +02:00
Lan Dong Si Hoang (Geraint Dong)
60998ed1e4 Merge branch 'master' into Add_pg_client_to_workspace_phpfpm 2017-10-24 13:03:56 +07:00
Geraint Dong
ee03bb607f Add support for pgclient to workspace & php-fpm 2017-10-18 10:04:23 +07:00
Zuohuadong
7f5d9d07d1 add postgresql for php-fpm 2017-10-17 12:23:48 +08:00
Zuohuadong
17ea7b313f update 2017-10-12 18:54:09 +08:00
Geraint Dong
3cc917c9de Add Postgre SQL Support for php-fpm & edit webserver session storage location 2017-09-25 17:30:30 +07:00
luciano
998aa1365e Add aerospike.so line to be load on php-fpm 2017-09-22 12:23:20 +01:00
Arhey
5c5f94600a Rename laravel.pool.conf to xlaravel.pool.conf
Fix issue #1011
2017-09-06 00:22:18 +03:00
Arhey
b2e372054f Fixed php-fpm build 2017-09-05 23:36:30 +03:00
Arhey
0a23d53ee5 Move php-imagick to php-fpm and enable it 2017-09-05 21:47:47 +03:00
Arhey
f6552aca97 Added support of ImageMagick to php-fpm 2017-09-05 21:09:34 +03:00
Eugene Kirdzei
a36620c3bd Restart build 2017-09-04 12:05:34 +03:00
Eugene Kirdzei
cddc934e1e Fix phpreddis installation for all versions of php 2017-09-04 11:33:14 +03:00
Eugene Kirdzei
53b3ad0f7e Fix Php Redis extension installation 2017-08-31 19:29:19 +03:00
Ujjwal Ojha
9dda2f6b9f image optimizers libraries 2017-07-10 18:49:39 +05:45
mycontroller
0290142bf4 Dockerfile-56 fill missing MSSQL section 2017-05-31 13:41:30 +08:00
Shao Yu Lung
5a8df95fd3 fixing PHP7.0 php-fpm mssql extension build failed 2017-05-20 10:35:41 +08:00
Shao Yu Lung
43545cefd2 fixing PHP7.1 php-fpm mssql extension build failed 2017-05-20 09:20:00 +08:00
Yu-Lung Shao (Allen)
71364f962e fix php-fpm show warning not install extension (#954) 2017-05-19 17:00:13 +08:00
Shao Yu Lung
848398d443 php-fpm service LDAP support 2017-05-12 19:23:03 +08:00
wxb
31d21c74a0 add swoole extension config 2017-05-08 01:42:46 +08:00
Winfried
3134221445 Fixing aerospike 2017-05-07 16:56:15 +02:00
Winfried
4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Shao Yu Lung
f162864e89 apt-get update just need run at first, after add-apt-repository or update apt source list. 2017-05-07 01:17:35 +08:00
Shao Yu Lung
02958c06fe php-fpm Dockerfile-71 MYSQL
* remove old section
* fill new section
2017-05-06 17:44:32 +08:00
Shao Yu Lung
a6e2a6ee59 php-fpm Dockerfile-70 MYSQL
install stable version
2017-05-06 17:44:32 +08:00
Shao Yu Lung
cf30e159fb php-fpm Dockerfile-70
fix ini file path
2017-05-06 17:44:32 +08:00
Shao Yu Lung
9f12f63aea php-fpm Dockerfile-70
remove duplicate MSSQL section.
2017-05-06 17:44:31 +08:00
Shao Yu Lung
a81686d9d0 aerospike-client-php version to 3.4.14 (php-fpm) 2017-05-05 19:13:10 +08:00
Mark Hilton
e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 13:01:03 -04:00
Winfried
5a5dceb967 Merge pull request #883 from laradock/843-sqlsrv-php71
Add sqlsrv to php-fpm php71
2017-05-02 15:29:45 +02:00
Winfried
02a512dd72 Dockerfile minor formatting 2017-05-01 22:20:25 +02:00
Winfried
d5883e4bcf Adding sqlsrv to php-fpm PHP71 2017-05-01 22:19:09 +02:00
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