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

926 Commits

Author SHA1 Message Date
Diego Antunes a91bd19739 Merge branch 'master' of https://github.com/laradock/laradock 2017-04-18 10:27:37 +12:00
Diego Antunes ba32dedbef Added Percona container as an alternative to mysql mariadb 2017-04-18 10:19:09 +12:00
Mahmoud Zalt df87c3e36b Merge pull request #817 from laradock/winfried-van-loon-patch-1 
Fixing typo in docs menu
 2017-04-17 17:16:26 -04:00
Winfried 425d344e97 Fixing typo in docs menu 2017-04-17 18:37:01 +02:00
Mahmoud Zalt 73ebc1effa Merge pull request #815 from bestlong/fix-adminer-login-fail 
Fixing Adminer can’t login
 2017-04-17 11:22:50 -04:00
Mahmoud Zalt bb8bf6ae10 Merge pull request #812 from bestlong/add-travis-ci-build-status-image 
Add Travis CI status image.
 2017-04-17 11:22:33 -04:00
Shao Yu Lung 5f3e0a9109 Fixing Adminer can’t login 2017-04-17 13:40:30 +08:00
Shao Yu Lung f7090a47a4 Add Travis CI status image. 2017-04-17 10:48:07 +08:00
Mahmoud Zalt 8ffb0ff3e3 Merge pull request #810 from wxb/master 
set data save path(mysql/redis/memcached..)
 2017-04-16 11:51:32 -04:00
wxb f14b3b32cf add php.ini file 2017-04-16 19:33:27 +08:00
wxb 3a8bd8a015 add data save path(mysql/redis/memcached..) 2017-04-16 19:08:03 +08:00
Mahmoud Zalt efc23a693d add missing workspace tools to the docs 2017-04-14 21:02:04 -04:00
Mahmoud Zalt 1235304a0d add missing containers to the docs 2017-04-14 20:02:27 -04:00
Mahmoud Zalt 13952f3468 fix docs images url on the site 2017-04-14 17:58:10 -04:00
Mahmoud Zalt 4a88cbc17a add logo and update some texts 2017-04-14 17:46:35 -04:00
Mahmoud Zalt dc71a125c3 testing travis doc generate 2017-04-14 14:55:45 -04:00
Mahmoud Zalt 5d1660567c rename the travis build scrit and update the new doc path 2017-04-14 14:54:47 -04:00
Mahmoud Zalt 57ee5d96a4 travis for docker build and hugo site 2017-04-14 14:52:54 -04:00
Mahmoud Zalt 919e0a75cd Delet the _settings folder from the Documentation 2017-04-14 14:43:28 -04:00
Mahmoud Zalt 43ace2bebe update contrubition docs 2017-04-14 14:37:31 -04:00
Mahmoud Zalt 07ad461e75 fix travis CI integration to generate Hugo Site 2017-04-14 14:30:39 -04:00
Eric Pfeiffer 9f4aaa9bc7 fix deploy local_dir. 2017-04-14 12:56:18 -05:00
Eric Pfeiffer ae01a9fd49 Fix the if statements for checking if env is set. 2017-04-14 12:31:09 -05:00
Eric Pfeiffer 94a383bea9 Forgot to make script executable. Oops 2017-04-14 12:19:56 -05:00
Eric Pfeiffer 375f733def Use Travis CI for building docker images and docs 2017-04-14 12:15:10 -05:00
Mahmoud Zalt 74efa008da regenerate site 2017-04-14 04:44:50 -04:00
Mahmoud Zalt 5a496bafeb move _guides to the documentation 2017-04-14 04:43:26 -04:00
Mahmoud Zalt 3a7e6e4b1a add travis file to auto generated documentation 2017-04-14 03:55:08 -04:00
Mahmoud Zalt f3598c3c97 Merge pull request #805 from bestlong/fixing-php-fpm-ghostscript 
Fixing php fpm ghostscript
 2017-04-14 03:24:54 -04:00
Mahmoud Zalt 4fd73ac512 Fix build error in php-fpm containers, after updating the base image 2017-04-14 03:23:19 -04:00
Mahmoud Zalt 747f956d01 update php-fpm base image tags {requires rebuild} 2017-04-14 03:12:00 -04:00
Yu-Lung Shao (Allen) 1519d2c64c Update Dockerfile-71 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:09:44 +08:00
Yu-Lung Shao (Allen) 43f4f80836 Update Dockerfile-70 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:08:44 +08:00
Yu-Lung Shao (Allen) ca7726c441 Update Dockerfile-56 
fixing unexpected message "/bin/sh: 1: [: =: unexpected operator", #798.
 2017-04-14 10:08:11 +08:00
Mahmoud Zalt c78eb5228a Merge pull request #803 from activeobjects/master 
Added support for jenkins official container
 2017-04-13 11:48:57 -04:00
Steve Walker 81053c0868 Added support for jenkins official container 2017-04-12 15:54:42 +00:00
Winfried b1367d237f Merge pull request #800 from chrissiboi/master 
Update Dockerfile-70
 2017-04-12 10:19:34 +02:00
Crispy 603207cc2b Update Dockerfile-70 
fixes a built crash because of an unexpected &&
 2017-04-12 10:17:06 +02:00
Mahmoud Zalt 43e2b3e403 Merge pull request #795 from hounded/master 
pdo_dblib
 2017-04-12 00:53:51 -04:00
Mahmoud Zalt f69422e82f Merge branch 'master' into master 2017-04-12 00:53:43 -04:00
Mike Erickson 96e82d4115 Merge pull request #793 from winfried-van-loon/php-fpm-56-args 
Fixing not-consumed buildargs php-fpm-56
 2017-04-11 18:36:13 -07:00
Mike Erickson 6d4a2c4cc4 Merge pull request #789 from winfried-van-loon/php-fpm-cleanup 
Fixing whitespaces and tailing spaces
 2017-04-11 18:35:17 -07:00
Mike Erickson f8e5f73e18 Merge pull request #794 from winfried-van-loon/xdebug-config 
Moving php-fpm xdebug config to proper location
 2017-04-11 18:35:03 -07:00
Mike Erickson cdc2811d7b Merge pull request #796 from winfried-van-loon/already-loaded-warnings 
Fixing the php ext already loaded warnings
 2017-04-11 18:34:45 -07:00
Mike Erickson 32d26c3e10 Merge pull request #799 from winfried-van-loon/787-workspace-soap-warning 
Fixing soap already loaded warning in workspace
 2017-04-11 18:33:37 -07:00
Mike Erickson b482d4d901 Merge pull request #783 from winfried-van-loon/php-fpm-71 
Bringing Dockerfile 71 up-to-date with 70
 2017-04-11 18:33:09 -07:00
Winfried ad00284a22 Removing ext enable aerospike error 2017-04-12 00:35:11 +02:00
Winfried a835c9e709 Fixing soap already loaded warning in workspace 2017-04-12 00:28:54 +02:00
James Whiteman 597f922db7 Update Dockerfile-70 2017-04-12 09:20:06 +12:00
Winfried cdb456a9b5 Fixing indentation 2017-04-11 23:19:58 +02:00