Commit Graph

2311 Commits

Author SHA1 Message Date
Parth Jani
bf83bf8334 minor grammatical typo fixed 2020-08-26 21:52:35 -04:00
Parth Jani
07b0c968fb grammer errors fixed 2020-08-26 21:41:55 -04:00
Parth Jani
373d769253
Merge pull request #1 from parthjani7/typo_fixes_parthjani7
Typo fixed in documentation
2020-08-19 08:19:28 -04:00
Parth Jani
e50c501b87
Typo fixed in documentation 2020-08-19 08:15:23 -04:00
Shao Yu-Lung (Allen)
5465f96267
Merge pull request #2660 from rtrzebinski-usc/add-rdkafka-to-workspace
Add rdkafka to workspace
2020-08-11 11:22:56 +08:00
Shao Yu-Lung (Allen)
1d184cd3a3
Merge pull request #2643 from enkhbatd/master
Minor update for index.md
2020-08-11 11:20:22 +08:00
Shao Yu-Lung (Allen)
0308326518
Merge pull request #2653 from filips123/support-python3-in-workspace
Add support for Python 3 in workspace
2020-08-11 11:19:29 +08:00
Shao Yu-Lung (Allen)
910f5cfd1d
Merge pull request #2673 from GautierDele/patch-1
change indentation of graylog
2020-08-11 11:02:05 +08:00
Shao Yu-Lung (Allen)
7f09671bac
Merge pull request #2675 from hwtdnet/master
update: php-fpm Dockfile
2020-08-11 10:59:47 +08:00
Johnson
dff28d7718 update: php-fpm Dockfile 2020-08-09 08:08:17 +08:00
Gautier
20ed0a5e59
change indentation of graylog
This indentation is causing problem with my deployment automation since it's the only one using 4 spaces instead of two
2020-08-04 16:20:05 +02:00
Shao Yu-Lung (Allen)
9d68a48c3e
Merge pull request #2671 from bestlong/certbot-baseimage-tag-missing
fix certbot baseimage tag name missing
2020-08-02 22:56:40 +08:00
Shao Yu Lung
c9819508c1 fix phusion/baseimage tag name 2020-08-02 00:34:24 +08:00
Shao Yu-Lung (Allen)
ac01fab0c2
Merge pull request #2649 from lbssousa/lbssousa-patch-1
Add support for custom docker-compose.yml
2020-07-30 21:24:56 +08:00
Shao Yu-Lung (Allen)
493a058d22
Merge pull request #2665 from haoyuqi/master
laravel-echo-server add change source
2020-07-30 21:23:22 +08:00
Hao Yuqi
7e513783e7 laravel-echo-server add change source 2020-07-25 16:29:55 +08:00
Robert Trzebinski
a953355850 add documentation about installing RDKAFKA extension 2020-07-21 16:53:13 +02:00
Robert Trzebinski
032e7c0c53 Add rdkafka to Workspace container 2020-07-21 16:45:21 +02:00
Shao Yu-Lung (Allen)
bb759d7b94
Merge pull request #2651 from gmalz/master
Add MeiliSearch Container
2020-07-19 01:51:16 +08:00
Filip Š
86f5a7d9e0 Force reinstall pip to fix warning 2020-07-13 23:17:45 +02:00
Filip Š
caee5e0f9f Add missing WORKSPACE_INSTALL_PYTHON3 to docker-compose.yml 2020-07-13 23:09:07 +02:00
Filip Š
4e7888cb08 Add support for Python 3 in workspace 2020-07-13 22:27:44 +02:00
Mgor
ef527bbab6 Add MeiliSearch Container 2020-07-08 12:25:23 +02:00
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
eba
e63a285b74
Minor update for index.md
Adjusted syntax
2020-06-28 02:43:29 +09: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
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
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