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

1412 Commits

Author SHA1 Message Date
牟勇 1342b696ea Merge branch 'master' of https://github.com/laradock/laradock 2017-11-14 20:57:52 +08:00
Mahmoud Zalt 2fc0f3cb2e improve readability of the .env file 2017-11-14 12:53:30 +02:00
Mahmoud Zalt 6c3b18340f
Merge pull request #1248 from mariano-dagostino/fix1247 
Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog
 2017-11-13 20:27:21 +02:00
Mahmoud Zalt de247a074e
Merge pull request #1246 from axit-joost/master 
Fixes laradock/laradock#1245 by adding python to the image
 2017-11-13 20:27:07 +02:00
Mahmoud Zalt 176dd74906
Merge pull request #1244 from zuohuadong/patch-21 
upgrade  Description
 2017-11-13 20:26:54 +02:00
Mahmoud Zalt 819b1eb3bc
Merge pull request #1243 from zuohuadong/patch-20 
fix pgadmin-backup
 2017-11-13 20:26:33 +02:00
Mariano D'Agostino 05dd1b0339 Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog 2017-11-13 13:37:04 -03:00
Joost Jacobs f0401f5047 Fixes laradock/laradock#/1245 by adding python to the image 2017-11-13 14:39:57 +01:00
huadong zuo be13fdba7f
upgrade Description 
upgrade  Description
 2017-11-13 18:35:11 +08:00
huadong zuo bd0f04bd80
fix pgadmin-backup 
new version has new contents
 2017-11-13 18:33:28 +08:00
Mahmoud Zalt f7ac8cf862
Merge pull request #1241 from nellonican/master 
Fix Dockerfile
 2017-11-12 20:56:40 +02:00
Thorvald Falkenburg b47963c80d Fix Dockerfile 
Building the workspace docker image with Dockerfile-71 failed because
of missing "&&"
 2017-11-12 19:45:44 +01:00
Mahmoud Zalt 35183eff42
Merge pull request #1240 from JeromeDesseaux/master 
solving python issue when using INSTALL_NODE=true and VueJS with Laravel.
 2017-11-12 18:17:45 +02:00
Jérôme Desseaux c5ccc2f4ff soving python issue when using INSTALL_NODE=true and VueJS with Laravel. 2017-11-12 11:04:57 +01:00
Mahmoud Zalt 34ef36cd7e doc updates 2017-11-10 14:37:01 +02:00
Mahmoud Zalt 7138d7a13c update some text in the index page 2017-11-08 09:01:40 +02:00
Mahmoud Zalt c7695ca175 add Huadong Zuo @zuohuadong to the contributors list 2017-11-08 08:31:29 +02:00
Mahmoud Zalt 6f3c41b84d add sponsors section 2017-11-08 08:18:26 +02:00
Mahmoud Zalt 46852bc31b
Merge pull request #1232 from zuohuadong/patch-17 
Update Dockerfile-71
 2017-11-08 05:24:42 +02:00
Mahmoud Zalt 5a21337cc5
Merge pull request #1231 from zuohuadong/patch-16 
Update Dockerfile-70
 2017-11-08 05:24:34 +02:00
Mahmoud Zalt e2091cd309
Merge pull request #1234 from zuohuadong/patch-19 
fix error
 2017-11-08 05:24:08 +02:00
Mahmoud Zalt 1ead8aa060
Merge pull request #1228 from JeroenVanOort/master 
added IMAP extension to workspace
 2017-11-08 05:19:08 +02:00
Mahmoud Zalt 7e393efbb6 add donations section 2017-11-08 05:16:50 +02:00
Mahmoud Zalt beecbe758b add Ads to docs 2017-11-08 04:55:58 +02:00
zuohuadong 1b1f6b7048
fix error 2017-11-07 10:55:27 +08: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
Jeroen van Oort 23ee4f6679 added IMAP extension to workspace 2017-11-06 11:12:02 +01:00
Mahmoud Zalt 4e486280f4
Merge pull request #1219 from NickToony/master 
Fixed: Missing PgSQL PDO drivers
 2017-10-29 20:14:31 +02:00
Nick Hope 9e807e39ee Updated: PHP-Worker documentation. 2017-10-29 13:03:59 +00:00
Nick Hope 894b0197e0 Fixed: PHP-Worker has missing PGSQL drivers. 2017-10-29 12:54:05 +00:00
Mahmoud Zalt c2c30bfd0f update workspace base image version 2017-10-28 04:34:59 +03:00
Mahmoud Zalt 152c896515 Merge pull request #1210 from nellonican/fix-env-vars 
Fix variable issues.
 2017-10-25 15:36:27 +03:00
Mahmoud Zalt 4682aff622 Merge pull request #1209 from nellonican/fix-grammar 
Fix grammar
 2017-10-25 15:35:49 +03:00
Thorvald Falkenburg a31114955a Remove variable 2017-10-25 12:12:20 +02: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
Thorvald Falkenburg eac717fb21 Fix grammar 2017-10-25 09:32:12 +02:00
Mahmoud Zalt c05c675408 Merge pull request #1201 from geraintdong/Add_pg_client_to_workspace_phpfpm 
Add pg client to workspace phpfpm
 2017-10-25 01:05:29 +03: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
Mahmoud Zalt 05879bdda2 Merge pull request #1203 from arkadiusjonczek/master 
Add Grafana container under Random Tools in introduction documentation
 2017-10-20 06:14:13 +03:00
Arkadius Jonczek 70a7bdca19 Merge remote-tracking branch 'upstream/master' 2017-10-19 18:52:50 +02:00
Arkadius Jonczek a71d5a8548 add Grafana to Random Tools list in introduction documentation 2017-10-19 18:51:17 +02:00
Mahmoud Zalt 9fa3733622 Merge pull request #1202 from arkadiusjonczek/master 
Add Grafana Container to laradock.io :)
 2017-10-19 19:41:51 +03:00
Arkadius Jonczek b8e657b68f Merge remote-tracking branch 'upstream/master' 2017-10-19 14:31:02 +02:00
Arkadius Jonczek 8aaa074af2 add Use Grafana section to documention 2017-10-19 14:29:50 +02:00
Mahmoud Zalt 3005dde240 Merge pull request #1200 from TitasGailius/master 
Use node:alpine image for laravel-echo-server
 2017-10-18 22:15:42 +03:00
Mahmoud Zalt b3922995e1 Merge pull request #1199 from zuohuadong/master 
add postgres for php-fpm
 2017-10-18 22:15:22 +03:00
Arkadius Jonczek 49e48edefd Merge remote-tracking branch 'upstream/master' 2017-10-18 14:41:20 +02:00
Arkadius Jonczek 182386b514 removed grafana-storage 2017-10-18 14:38:10 +02:00
Arkadius Jonczek bea122a1fd removed depends_on from grafana and added Grafana port to env-example 2017-10-18 14:34:27 +02:00