ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,813 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

2813 Commits

Author SHA1 Message Date
Patrick e14e5b7caf
Fix bad style 2020-02-01 15:18:36 +01:00
Saulo Paiva 8b4391e63c Use MYSQL_VERSION env var to build mysql image 2020-01-25 11:23:48 -03:00
Nathanael 5aafed586b upgraded elasticsearch, logstash and kibana images and provided an environment variable to specify a version for the entire ELK stack. 2020-01-22 15:37:04 -03:00
Scott Collier 7fec2186ef Add bash-git-prompt in order to have a more descriptive prompt when working with repositories. 
Also, update documentation for bash-git-prompt usage. Make sure initial value for usage is false.
 2020-01-20 12:25:44 -06:00
Scott Collier b28f449556 Add bash-git-prompt in order to have a more descriptive prompt when working with repositories. 
Also, update documentation for bash-git-prompt usage
 2020-01-20 12:24:18 -06:00
Shao Yu-Lung (Allen) ad2b455be5
Merge pull request #2470 from laradock/upgrade-php-fpm 
upgrade php-fpm base image version
 2020-01-16 19:26:00 +08:00
Shao Yu-Lung (Allen) bb7ee22f6a
Merge pull request #2396 from ludo237/master 
Add the ability to install ffmpeg on Laravel Horizon container
 2020-01-16 15:06:11 +08:00
Shao Yu-Lung (Allen) 9461c859f0
upgrade base image version 2020-01-16 14:57:19 +08:00
Dan Wilson 711b2e7449 Updated documentation with wkhtmltopdf section 2020-01-15 13:44:53 -05:00
Dan Wilson 8ecd35d2e9 Added wkhtmltopdf installation to both Workspace and PHP-FPM 2020-01-15 12:01:35 -05:00
Claudio Ludovico 84b5c5aaa0
Update config 
Add user created during docker installation
 2020-01-14 16:10:42 +01:00
Claudio Ludovico 3f6b779254
Merge branch 'master' into master 2020-01-14 16:09:18 +01:00
Claudio Ludovico a84611ff4b
Update docker-compose.yml 
Add necessary args
 2020-01-14 16:07:07 +01:00
Claudio Ludovico 4fbe5c03b9
Update Dockerfile 
Add non-root user for ffmpeg installation
 2020-01-14 16:06:25 +01:00
Shao Yu-Lung (Allen) cd84c464b3
Merge pull request #2468 from bestlong/php74-worker 
php 7.4 required oniguruma
 2020-01-14 22:32:09 +08:00
Shao Yu Lung 8011182a34 php 7.4 required oniguruma 2020-01-14 21:38:24 +08:00
Mahmoud Zalt 5c10a024f1 Make small documentation updates 
- remove guides section
- re-order some content
- fix some links
- remove duplicated ads
 2020-01-12 15:38:58 +01:00
Shao Yu-Lung (Allen) 8a1b3c45c8
Merge pull request #2461 from bestlong/php74-zip-option 
PHP 7.4 zip option removed
 2020-01-09 20:04:44 +08:00
Shao Yu Lung ef267a64e6 PHP 7.4 zip option removed 2020-01-06 23:39:23 +08:00
Shao Yu-Lung (Allen) 0d086024a8
Merge pull request #2457 from laradock/upgrade-apache2 
upgrade apache2
 2020-01-05 01:07:21 +08:00
Shao Yu Lung 92e7a8559d upgrade apache2 2020-01-03 20:07:42 +08:00
Shao Yu-Lung (Allen) 3c36fc7d16
Merge pull request #2449 from jrseliga/smb-client 
Provide smbclient and php-smbclient
 2019-12-31 19:14:34 +08:00
Shao Yu-Lung (Allen) de57f728cc
fix build-args INSTALL_GHOSTSCRIPT were not consumed (#2452) 2019-12-31 19:12:37 +08:00
Justin Seliga 9aecc53dba provide smbclient and php-smbclient to php-fpm and workspace containers 2019-12-27 19:34:56 -05:00
Miguel Ortiz aec544961c
Merge branch 'master' into develop 2019-12-26 11:55:09 -05:00
Shao Yu-Lung (Allen) f64360ab74
Merge pull request #2443 from sohaibilyas/fix-gearman-php-worker 
updated gearman installation code in php-worker service
 2019-12-26 19:56:12 +08:00
Shao Yu-Lung (Allen) 27f2ffdd6c
Merge pull request #2445 from vladitot/master 
Changes in env file. Some parameteres quoted
 2019-12-26 19:54:57 +08:00
Vladimir Zakotnev 716282b504 Changes in env file. Some parameteres quoted 2019-12-24 14:20:54 +03:00
Sohaib Ilyas b74c54f804 updated gearman installation code in php-worker service 2019-12-24 02:45:19 +05:00
Shao Yu-Lung (Allen) 8203e5da29
Merge pull request #2236 from manticoresoftware/master 
update manticore log folder
 2019-12-22 15:35:57 +08:00
Shao Yu-Lung (Allen) bad3b76963
Merge pull request #2200 from clonn/patch-1 
gcloud registry auth step for docker build
 2019-12-22 15:33:33 +08:00
Shao Yu-Lung (Allen) cc1d6aaebf
Merge pull request #2226 from ajoy39/master 
Add support for pcov code coverage driver
 2019-12-22 15:31:22 +08:00
Shao Yu-Lung (Allen) a9f84bfa61
Merge pull request #2437 from bestlong/fix-php74-horizon 
Laravel Horizon PHP 7.4 - fix package oniguruma require
 2019-12-22 13:27:16 +08:00
Shao Yu-Lung (Allen) 67e9a517f3
VSCode files.associations for Dockerfile-* (#2438) 2019-12-21 22:26:03 +08:00
Shao Yu Lung 964494255d fix oniguruma require 
#2407
#2408
 2019-12-21 22:16:24 +08:00
Shao Yu-Lung (Allen) c68bbd4f83
Merge pull request #2422 from rmeira/master 
Update MSSQL image
 2019-12-21 18:52:41 +08:00
Shao Yu-Lung (Allen) 713799c17b
Merge pull request #2431 from kideny/master 
update phalcon ext version
 2019-12-21 18:41:21 +08:00
Shao Yu-Lung (Allen) fc5ab30d4f
Merge pull request #2424 from appleboy/locale 
chore(php-fpm): update the default locale setting.
 2019-12-19 20:08:55 +08:00
Shao Yu-Lung (Allen) 89a1ac652e
Merge pull request #2276 from jzonta/add_oci8_supports 
Added support for OCI8 extension in workspace and php-fpm containers.
 2019-12-19 20:07:34 +08:00
Shao Yu-Lung (Allen) d732318e52
Merge pull request #2273 from Insua/master 
fix(compose file): add missing config for inotify and fswatch
 2019-12-17 20:48:15 +08:00
Shao Yu-Lung (Allen) ccf85148e8
Merge branch 'master' into master 2019-12-17 20:47:56 +08:00
Shao Yu-Lung (Allen) 378900ee38
Merge pull request #2365 from amorZhu/master 
update document for workspace supervisor
 2019-12-17 20:44:31 +08:00
kideny 30c91c7f94 fixed 2019-12-15 23:21:51 +08:00
Shao Yu-Lung (Allen) e943d90ca2
Merge pull request #2427 from lbssousa/devcontainer-v3 
Drop unneeded settings for devcontainer.json (VSCode already handles them automatically)
 2019-12-12 08:37:50 +08:00
Laércio de Sousa d847c1a8c5 Drop unneeded settings for devcontainer.json (VSCode already handles them automatically). 2019-12-11 15:18:34 -03:00
Shao Yu-Lung (Allen) ace85c38d7
Merge pull request #2425 from bestlong/php-fpm-use-new-base-image 
php-fpm base image use 2.6.2
 2019-12-12 00:13:14 +08:00
Shao Yu Lung be48366190 php-fpm base image use 2.6.2 2019-12-11 21:18:57 +08:00
Bo-Yi Wu a1d7d46573 chore(php-fpm): update the default locale setting. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2019-12-11 14:28:14 +08:00
Rafael Meira 0da0f302d3
Update env-example 2019-12-10 11:12:53 -03:00
Rafael Meira a010010d97
remove this file use master 2019-12-10 11:11:54 -03:00