Commit Graph

3162 Commits

Author SHA1 Message Date
Larry
b7de2868eb fix bug in php-worker 2021-07-21 13:46:21 +08:00
xiagw
0b0cbdd18d Merge branch 'master' into master-xiagw 2021-07-20 15:44:15 +08:00
Memo Chou
96e5e8220e Use dotenv for env keys 2021-07-11 00:38:01 +08:00
Memo Chou
2ac65c3fea Add console port and fix environments for minio 2021-07-11 00:13:15 +08:00
Valentino Lauciani
58edaa6421
Add Alpine version to solve issue: https://github.com/laradock/laradock/issues/3008 2021-07-01 12:22:46 +02:00
Larry
b0d928762e restore default.conf root path for openresty 2021-06-26 00:45:55 +08:00
Larry
46e5daa160 add openresty and ssdb setting in .env.example 2021-06-26 00:15:19 +08:00
Shao Yu-Lung (Allen)
2bbe850d28
Merge pull request #2999 from egege/master
change README-zh
2021-06-24 22:58:47 +08:00
Larry
b0f6fec975 remove dns setting in ssdb 2021-06-24 00:13:46 +08:00
Larry
e0a88ac371 add openresty and ssdb 2021-06-23 22:56:12 +08:00
zhangxuejiang
ae57d2bd1f change README-zh 2021-06-22 23:41:00 +08:00
Shao Yu-Lung (Allen)
ef88ad84fd
Merge pull request #2995 from garbinmarcelo/master
Changed startup.sh from supervisord to apache2ctl
2021-06-16 21:31:51 +08:00
Larry
0b6c266744 fix bug 2021-06-12 21:28:43 +08:00
Larry
898434b59e add php ssdb extension 2021-06-12 20:49:45 +08:00
Shao Yu-Lung (Allen)
ef1140dc4a
Merge pull request #2046 from lanphan/mssql
update adminer to support SQL Server
2021-06-12 10:50:41 +08:00
Shao Yu-Lung (Allen)
329bdce155
Merge pull request #2854 from erfantkerfan/master
allow larage file imports
2021-06-12 10:47:30 +08:00
Shao Yu-Lung (Allen)
bc34cfe362
Merge pull request #2985 from SinCOS/master
update source.sh for chinese source
2021-06-12 10:45:23 +08:00
Shao Yu-Lung (Allen)
ad072b50fb
Merge pull request #2989 from blite/patch-1
Documentation Fix: Correct port number on phpmyadmin setup
2021-06-11 16:36:05 +08:00
Shao Yu-Lung (Allen)
dd596be437
Merge pull request #2972 from AxelPAL/nats
Add NATS messaging system
2021-06-11 16:34:24 +08:00
Marcelo Garbin
90660fbb77 changed startup from supervisor to apache2ctl 2021-06-10 00:06:56 -03:00
xiagw
7017d87a77 Merge remote-tracking branch 'origin/master' into master-xiagw 2021-06-09 20:07:42 +08:00
ben
eda21c22ff
Correct port number on phpmyadmin setup
Port was 8080 but the default is set to 8081
2021-06-06 15:01:06 -07:00
SinCOS
b45c68a1d0
Merge pull request #1 from SinCOS/update-ubuntu-mirrors-version-for-chinese
Update sources.sh
2021-06-04 22:23:50 +08:00
SinCOS
fb6c672cae
Update sources.sh 2021-06-04 22:22:51 +08:00
Alexander Palchikov
0c7f5a2b2a
nats messaging system 2021-06-04 18:32:37 +05:00
Shao Yu-Lung (Allen)
3d57064466
Merge pull request #2982 from aa-ahmed-aa/custom_composer_version
give laradock the ability to install custom composer version
2021-06-04 20:55:03 +08:00
Shao Yu-Lung (Allen)
9618f069d3
Merge pull request #2981 from AxelPAL/tarantool
Add Tarantool platform
2021-06-04 20:53:41 +08:00
Shao Yu-Lung (Allen)
82d3bf4c97
Merge pull request #2984 from da-mask/master
Update multiple projects section
2021-06-04 13:05:41 +08:00
da-mask
5d19a3646e
Update multiple projects section
Added some extra clarification on a point that tricked me up for a bit.
2021-06-03 14:18:53 +10:00
aa-ahmed-aa
da1124aacb give laradock the ability to install custom composer version 2021-06-02 19:14:30 +02:00
AxelPAL
885e47d117 added tarantool admin service 2021-06-02 15:20:22 +05:00
Alexander Palchikov
e92ce2eb6c
adding Tarantool 2021-05-27 23:28:58 +05:00
Shao Yu-Lung (Allen)
77be7c4001
Merge pull request #2976 from ahkui/ahkui-fix-python-pip
workspace - install pip from python script
2021-05-26 18:32:11 +08:00
Shao Yu-Lung (Allen)
399d1c8181
Merge branch 'master' into ahkui-fix-python-pip 2021-05-26 12:22:58 +08:00
Shao Yu-Lung (Allen)
09043c4992
Merge pull request #2973 from mics8128/master
fix build workspace error when WORKSPACE_INSTALL_MSSQL=true
2021-05-26 12:19:12 +08:00
Mahmoud Zalt
5cf7449d42 update sponsors logos 2021-05-25 20:33:23 +02:00
ahkui
cc88f7b382 workspace - install pip from python script 2021-05-24 03:06:31 +08:00
Mahmoud Zalt
f031ded6dd update sponsors logos 2021-05-21 17:40:47 +02:00
Mics
e138f03d50 fix build workspace error when WORKSPACE_INSTALL_MSSQL=true 2021-05-20 18:16:42 +08:00
Shao Yu-Lung (Allen)
8fb2cccdd9
Merge pull request #2965 from garbinmarcelo/master
removed gitkeep from apache2/ssl and duplication APACHE_SSL_PATH
2021-05-20 13:08:57 +08:00
Shao Yu-Lung (Allen)
74528be87b
Merge pull request #2970 from egege/egege-pr
elk change to docker official repository
2021-05-19 09:33:33 +08:00
zhangxuejiang
a98cc18a74 elk change to docker official repository 2021-05-14 17:39:35 +08:00
Marcelo Garbin
c548447d9a removed gitkeep from apache2/ssl and duplication APACHE_SSL_PATH 2021-05-04 08:55:20 -03:00
Shao Yu-Lung (Allen)
477428146e
Merge pull request #2964 from DocLM/bugfix/postgres-permissions
Fix PostgreSQL initialization scripts permissions
2021-05-01 23:53:33 +08:00
Shao Yu-Lung (Allen)
e678fafc07
Merge pull request #2962 from ryan1068/patch-1
Add Kafka Service
2021-05-01 23:37:21 +08:00
Leonardo Medici
6a4d93ee2f
Fix PostgreSQL initialization scripts permissions 2021-05-01 11:26:49 +02:00
Ryan
e95bfd835e
Update docker-compose.yml 2021-04-26 11:26:40 +08:00
Shao Yu-Lung (Allen)
618a9d180c
Merge pull request #2960 from laradock/fix-ci
feat(CI build failed):  php-fpm AMQP
2021-04-26 10:38:14 +08:00
Shao Yu-Lung (Allen)
f49b0cbc3a clean up 2021-04-25 23:49:07 +08:00
Shao Yu-Lung (Allen)
78e0d4d54c fix amqp build faild
#2959
2021-04-25 23:48:10 +08:00