ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,287 Commits 1 Branch 159 Tags
23a1aaa8b0a9f0ce5be52b9d062a757ddb6d250e
Commit Graph

2287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laércio de Sousa
23a1aaa8b0 Add support for custom docker-compose.yml 
For some reason, one may want/need to edit laradock's default file `docker-compose.yml` e.g. srtipping out uneeded services, so that the whole project can be brought up with a simple `docker-compose up` command. With this commit, the user can copy default `docker-compose.yml` as `docker-compose.custom.yml` and make the desired changes there. This file will not be tracked by Git.
 2020-07-03 16:17:17 -03:00
Shao Yu-Lung (Allen)
a1cda7f497 Merge pull request #2648 from vvasiloi/patch-1 
update link
 2020-07-02 10:02:37 +08:00
Victor Vasiloi
6ce9f87676 update link 2020-07-01 13:08:48 +03:00
Shao Yu-Lung (Allen)
019dbea2f2 Merge pull request #2647 from kiczek/master 
fix of the default gearman port
 2020-07-01 13:30:40 +08:00
Jakub Kiczko
536747e933 fix of the default gearman port 2020-06-30 12:44:09 +02:00
Shao Yu-Lung (Allen)
4d5a6325cc fix .env xmlrpc 
#2630
 2020-06-19 22:29:14 +08:00
Shao Yu-Lung (Allen)
4e4afb2013 Merge pull request #1719 from juniorrosul/graphviz 
Graphviz support
 2020-06-19 19:33:14 +08:00
Shao Yu-Lung (Allen)
d11186e76c Update Dockerfile 
clean duplicate apt-get install nasm
 2020-06-19 18:44:40 +08:00
Shao Yu-Lung (Allen)
6f75a29a2f Merge branch 'master' into graphviz 2020-06-19 18:42:05 +08:00
Shao Yu-Lung (Allen)
ffb90a8e2d Rename default.conf.example to default.conf 2020-06-19 18:35:17 +08:00
Mahmoud Zalt
a4ed4cd034 add more open collective links to display more logos 2020-06-19 00:33:45 +02:00
Shao Yu-Lung (Allen)
41ad5527da Merge pull request #2635 from laradock/file-association 
set env-example file association for vscode
 2020-06-18 09:37:11 +08:00
Shao Yu Lung
c7bac4fc31 set env-example file association for vscode 2020-06-18 09:35:46 +08:00
Shao Yu-Lung (Allen)
cbb949c273 Merge pull request #2634 from bestlong/fix-port-conflict 
fix bind port conflict
v11.0 		2020-06-18 08:56:10 +08:00
Shao Yu Lung
aa179b6ca3 fix bind port conflict 
change phpmyadmin and adminer default bind port to 8081
 2020-06-18 08:34:45 +08:00
Shao Yu-Lung (Allen)
a8ac0b62cf Merge pull request #2563 from jefflssantos/patch-1 
Fix Deployer documentation link
 2020-06-17 23:30:58 +08:00
Shao Yu-Lung (Allen)
13776a4f6f Merge pull request #2628 from KNY00/fix-vscode-settings-file 
Fix trailing whitespace
 2020-06-17 23:30:00 +08:00
Shao Yu-Lung (Allen)
2ce3745cf1 Merge pull request #2633 from Sofar1994/master 
php-fpm container xdebug.ini name is xdebug.ini
 2020-06-17 23:25:33 +08:00
lianyunfeng
4a1100e685 php-fpm container xdebug.ini name is xdebug.ini 2020-06-17 17:00:14 +08:00
Shao Yu-Lung (Allen)
6c942b454b Merge pull request #2631 from bestlong/php-worker-imagick 
php-worker support imagick
v10.1 		2020-06-17 07:53:10 +08:00
Shao Yu Lung
d81f9f2779 php-worker support imagick 2020-06-17 00:30:07 +08:00
Shao Yu-Lung (Allen)
1dd23a01a5 Merge pull request #2630 from bestlong/xmlrpc 
support php-xmlrpc extension
 2020-06-17 00:26:31 +08:00
Shao Yu Lung
35081fd9be support php-xmlrpc extension 2020-06-17 00:05:03 +08:00
KNY
2224685d7e Fix trailing whitespace 2020-06-15 23:59:42 +02:00
Shao Yu-Lung (Allen)
12ade0d730 Merge pull request #2622 from yosoyfunes/patch-1 
Update docker-compose.yml
 2020-06-13 00:29:13 +08:00
Matias Anoniz
89ee774ece Update docker-compose.yml 
Increment nofile, check the documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_increase_ulimits_for_nofile_and_nproc
 2020-06-12 12:14:10 -03:00
Shao Yu-Lung (Allen)
f2209eeb72 Merge pull request #2582 from kideny/master 
update support phalcon4.X version
 2020-06-06 17:36:27 +08:00
Shao Yu-Lung (Allen)
6712bdcfa9 Merge pull request #2609 from tancou/gitlab-ci 
Remove deprecated gitlab ci file
 2020-06-06 17:35:23 +08:00
Shao Yu-Lung (Allen)
9df698e011 Merge pull request #2613 from m-elewa/develop 
Update Traefik image to v2.2
 2020-06-06 16:59:16 +08:00
Shao Yu-Lung (Allen)
5b0d264b6c Merge pull request #2614 from m-elewa/feature/update-netdata-image 
update netdata image to the latest version of the official image
 2020-06-06 16:57:24 +08:00
Mahmoud Elewa
bc9825d398 update netdata image to the latest version of the official image 2020-05-31 14:44:09 +00:00
Mahmoud Elewa
b5419c352d change port variables from nginx to trafik 2020-05-31 07:43:41 +00:00
Mahmoud Elewa
227591cfb5 update documentation for Traefik v2.2 2020-05-31 07:13:13 +00:00
Mahmoud Elewa
90ba6df3ad update traefik to v2.2 2020-05-31 07:07:05 +00:00
Shao Yu-Lung (Allen)
4f7ab34a6b Merge pull request #2607 from acidicyemi/master 
fixed supervisor docker-composer instead of docker-compose syntax error
 2020-05-30 17:15:14 +08:00
Shao Yu-Lung (Allen)
bc3a35fd60 Merge pull request #2605 from jzonta/master 
Fixed error with memcached when running php-worker
 2020-05-30 14:31:31 +08:00
Shao Yu-Lung (Allen)
131025be44 Merge pull request #2606 from jzonta/add-oci8-php-worker 
Added support for OCI8 extension in php-worker
 2020-05-30 14:30:13 +08:00
Shao Yu-Lung (Allen)
ae58620386 Merge pull request #2608 from tancou/add-imap-worker-support 
Adding support for IMAP on php-worker
 2020-05-30 14:28:41 +08:00
tancou
b8a1690bc3 Remove deprecated gitlab ci file 2020-05-29 18:13:20 +02:00
tancou
9d10b5a7ef Adding support for IMAP on php-worker 2020-05-29 16:30:02 +02:00
Ajayi Adeyemi
959329c241 fixed supervisor type syntax error 2020-05-29 02:41:39 +01:00
João Zonta
0792766d41 Added support for OCI8 extension in php-worker, Sugestão do amigo @bestlong in #2276 2020-05-28 13:37:01 -03:00
João Zonta
8477ca86f5 Fixed error with memcached when running php-worker 2020-05-28 09:50:30 -03:00
Shao Yu-Lung (Allen)
6b16f2b479 Merge pull request #2602 from norieli/patch-1 
fixed mongodb can not authentication
 2020-05-27 13:41:34 +08:00
Norie
f4d5a892b1 fixed mongodb can not authentication 
The SCRAM_SHA_256 authentication mechanism requires libmongoc built with ENABLE_SSL. But current versio not support.
 2020-05-22 13:43:25 +08:00
Shao Yu-Lung (Allen)
bad5f69379 Merge pull request #2595 from bestlong/fix-2576-bug 
workspace expose angular cli serve port
 2020-05-21 09:55:53 +08:00
Shao Yu Lung
667bfc5e1b workspace expose angular cli serve port 2020-05-21 09:40:36 +08:00
Shao Yu-Lung (Allen)
d39f793f34 Merge pull request #2594 from bestlong/horizon-php-ext-imagick 
Horizon support ImageMagick
 2020-05-21 09:31:35 +08:00
Shao Yu-Lung (Allen)
f910f944da Merge pull request #2576 from Yiidiir/patch-1 
Expose Angular CLI serve port
 2020-05-21 09:16:28 +08:00
Shao Yu-Lung (Allen)
941ad16cbe Merge pull request #2567 from carlosclayton/master 
Installing Filebeat plugin
 2020-05-21 09:15:05 +08:00