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

1251 Commits

Author SHA1 Message Date
Mahmoud Zalt f8fd92fb0a Merge pull request #766 from BrianDGLS/patch-1 
fix typo in README.md
 2017-04-09 12:26:41 -04:00
Brian Douglas 61b038e0d9 fix typo in README.md 2017-04-09 09:42:28 +01:00
Mahmoud Zalt 5b60b7ffb8 Merge pull request #760 from bestlong/patch-1 
fix php-fpm PHP56 can't enabled MySQL Support
 2017-04-07 11:27:39 -04:00
Mahmoud Zalt 6e1911bdd5 Merge pull request #758 from hounded/master 
MySQL fix
 2017-04-07 11:27:32 -04:00
Yu-Lung Shao (Allen) d376074936 fix #759, php-fpm can't enabled MySQL Support 
lost passthru parameter
 2017-04-07 15:14:15 +08:00
James Whiteman 64b985f005 Update docker-compose.yml 2017-04-07 14:27:15 +12:00
James Whiteman cc50339bcb Update docker-compose.yml 2017-04-07 14:25:40 +12:00
James Whiteman 8820501644 Update Dockerfile 2017-04-07 14:24:15 +12:00
James Whiteman 07021b01f4 Delete startup 2017-04-07 14:23:02 +12:00
Mahmoud Zalt 13891a52dd Merge pull request #757 from hounded/master 
Symfony support in workspace
 2017-04-06 20:12:19 -04:00
Mahmoud Zalt a1bbe23800 Merge pull request #755 from if-kenn/master 
remove /Volumes and /private entries for d4m-nfs from docs
 2017-04-06 20:12:10 -04:00
James Whiteman 2b5fdc00ee Update Dockerfile-70 
install symfony and add alias for symfony
 2017-04-07 10:22:26 +12:00
James Whiteman 68ff573904 Update docker-compose.yml 
Added Install_symfony
 2017-04-07 10:20:19 +12:00
James Whiteman 3a62814fdc Update env-example 
added install symfony to workspace
 2017-04-07 10:19:23 +12:00
Kenn Herman da043ee0c4 remove /Volumes and /private entries 
The /Volumes entry is not good with how NFS exports hierarchically.
The /private entry should not just be included by default.

45f1628be6
 2017-04-06 09:20:22 -07:00
Mahmoud Zalt 5cd6ea41f9 Merge pull request #751 from david-perez/master 
Fix PHP Zip library installation
 2017-04-05 20:54:17 -04:00
david-perez d321be888c Fix PHP Zip library installation 2017-04-05 15:06:47 +02:00
Michael Chen 7230b11d3b Fixing specified Dockerfile name (#745) 2017-04-05 13:45:29 +08:00
Mahmoud Zalt 7b9ec17d8d Merge pull request #743 from tjlytle/feature-nginx-logs 
✨ Sending logs to docker `stdout` and `stderr`.
 2017-04-04 20:48:18 -04:00
Mahmoud Zalt 18b38db037 Merge pull request #742 from winfried-van-loon/patch-1 
Updating the DigitalOcean guide
 2017-04-04 20:47:52 -04:00
Mahmoud Zalt adfb468913 Merge pull request #741 from winfried-van-loon/714-workspace-php-version 
Updating env to switch workspace php version
 2017-04-04 20:46:14 -04:00
Mahmoud Zalt 43f4211abb Merge pull request #740 from winfried-van-loon/724-php-version 
Simplifying PHP_FPM version
 2017-04-04 20:44:58 -04:00
Mahmoud Zalt b1b8585518 Merge pull request #738 from winfried-van-loon/master 
Adding option to install Php5 MySQL extension
 2017-04-04 20:43:39 -04:00
Winfried van Loon d8fd1a5de0 Updating the DigitalOcean guide 2017-04-05 00:32:41 +02:00
Tim Lytle 585baf0668 ✨ Sending logs to docker `stdout` and `stderr`. 2017-04-04 18:05:28 -04:00
Winfried f99eff3a99 Updating env to switch workspace php version. #714 2017-04-04 23:39:03 +02:00
Winfried ff4b913396 Simplifying PHP_FPM version. #724 2017-04-04 23:14:04 +02:00
Winfried e861348475 Adding option to install Php5.x MySQL #722 2017-04-04 16:39:53 +02:00
Mahmoud Zalt b0831240b1 Merge pull request #737 from winfried-van-loon/master 
Fixing MariaDB root password variable. #736
 2017-04-03 22:10:39 -04:00
Winfried 37dee56bb7 Fixing MariaDB root password variable. #736 2017-04-04 00:05:44 +02:00
Mahmoud Zalt 2b11fc2299 Merge pull request #732 from cjmaxik/patch-4 
Update supervisord.conf
 2017-04-03 09:56:13 -04:00
Mahmoud Zalt 754ca4cd4f Merge pull request #730 from partounian/patch-1 
Correct Supported Software list bullet points
 2017-04-03 09:55:42 -04:00
Mahmoud Zalt 10e3dc16d2 Merge pull request #729 from innerspirit/master 
Marked toolbox as outdated in docs
 2017-04-03 09:55:25 -04:00
Mahmoud Zalt e23c6dae90 Merge pull request #717 from zeroc0d3/proxy 
Merge with Proxy branch
 2017-04-03 09:54:27 -04:00
Max Mekenya 96c1d7c59c Update supervisord.conf 
We have project in `/var/www` by default, not in `/var/www/laravel`

https://github.com/laradock/laradock/issues/731
 2017-04-03 15:30:41 +10:00
Patrick Artounian c574943e16 Correct Supported Software list bullet points 2017-03-31 14:01:17 -07:00
Christian Maioli 3226206267 Fixed some bad links 2017-03-31 13:35:13 -03:00
Christian Maioli 63543b890a Marked toolbox as outdated in docs 2017-03-31 12:51:08 -03:00
ZeroC0D3 Team b58f859eff Merge branch 'master' into proxy 2017-03-31 16:42:30 +07:00
Mahmoud Zalt 170a1efeb1 Merge pull request #727 from partounian/master 
Add Adminer container
 2017-03-31 00:35:40 -04:00
Mahmoud Zalt 50e3d1667f Merge pull request #726 from innerspirit/master 
Fixed typo
 2017-03-31 00:30:31 -04:00
Patrick Artounian 269732d8ea Remove comment about requiring nginx/fastcgi 2017-03-30 18:25:29 -07:00
Patrick Artounian a11206d4ba Change adminer expose port to 8080 
Most webservers default to 80, but Adminer's docker container runs on 8080.
 2017-03-30 18:19:06 -07:00
Christian Maioli (@christianmaioli) cb78a6c3d6 Merge pull request #1 from innerspirit/doc-typo 
Fixed typo
 2017-03-30 17:27:27 -03:00
Christian Maioli (@christianmaioli) 662280c139 Fixed typo 2017-03-30 17:26:20 -03:00
Patrick Artounian 68dd2fd019 Switch from adminer:fastcgi to adminer:latest 
This is to allow standalone usage.
 2017-03-29 22:50:01 -07:00
Patrick Artounian c193c5d03b Correct Adminer repo 2017-03-29 22:29:18 -07:00
Patrick Artounian 4efb5b43c6 Add Adminer to docs 2017-03-29 22:23:49 -07:00
Patrick Artounian 3d2eb81cd5 Add necessary Adminer config below PMA sections 2017-03-29 22:13:33 -07:00
Patrick Artounian a8d7937889 Add ADM_PORT to env-example 2017-03-29 22:12:53 -07:00