Commit Graph

371 Commits

Author SHA1 Message Date
larryeitel
07d6ec85ca Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-30 08:40:28 -06:00
Mahmoud Zalt
adfb559521 Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk
expose-port-22-and-add-insecure_id_rsa_ppk
2016-08-30 17:29:51 +03:00
Mahmoud Zalt
05e0e9c817 Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
2016-08-30 11:06:16 +03:00
Mahmoud Zalt
ab53db1897 Merge pull request #268 from appleboy/patch-10
fix #267 phpmyadmin is not working on linux.
2016-08-30 11:05:08 +03:00
Mahmoud Zalt
6dcb174012 Merge pull request #266 from bktz/master
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
Mahmoud Zalt
38eeae8791 Merge pull request #265 from computerfr33k/remove-env-commands-from-php-fpm
Remove env commands from php fpm
2016-08-30 11:03:27 +03:00
Mahmoud Zalt
de914d106f Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size
use docker image which only supplies true & echo binaries.
2016-08-30 11:01:33 +03:00
Mahmoud Zalt
6c71d6d84f Merge pull request #261 from appleboy/patch-4
support specific node version
2016-08-30 10:59:50 +03:00
Bo-Yi Wu
7b2ff6dab8 fix #267 phpmyadmin is not working on linux.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-30 13:16:18 +08:00
Benjamin Katznelson
1e5d604470 Added support for RabbitMQ 2016-08-28 18:12:55 +10:00
Eric Pfeiffer
314e43bb79 Update Dockerfile-56 2016-08-28 00:04:52 -05:00
Eric Pfeiffer
ea047e2587 remove unnecessary env commands
These environment variables are not needed since they are only being used at build time and we are already specifying them using the ARG command, no need to specify it twice since it increases build time and size.
2016-08-28 00:04:19 -05:00
larryeitel
d441427852 Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:22:36 -06:00
larryeitel
227c8da17c Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:00:01 -06:00
larryeitel
14b97caa57 Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-27 14:52:28 -06:00
Eric Pfeiffer
6ba76da709 use docker image which only supplies true & echo binaries. 2016-08-27 13:18:13 -05:00
Bo-Yi Wu
294fe31a80 update nvm version.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 22:54:59 +08:00
Bo-Yi Wu
78be0b577e support specific node version
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 19:38:44 +08:00
Mahmoud Zalt
5a980b1c97 add debugging steps for thr 404 windows error 2016-08-27 10:00:09 +03:00
Mahmoud Zalt
3ad474a2d9 move contributing to the root 2016-08-27 09:06:22 +03:00
Mahmoud Zalt
0ad1e58bf0 Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
  fix caddy Dockerfile from previous commit.
  caddy log to file. enable gzip compression.
  update caddy to v0.9.1
  Laravel 5.3 is published officially
  Create README-zh.md
2016-08-27 08:57:15 +03:00
Mahmoud Zalt
0cf12c7383 update the readme 2016-08-27 08:57:03 +03:00
Mahmoud Zalt
4e0af7e0cb Merge pull request #259 from computerfr33k/master
Update caddy server and log to file
2016-08-27 08:54:35 +03:00
Mahmoud Zalt
d6b091df96 Merge pull request #258 from helsont/patch-1
Laravel 5.3 is published officially
2016-08-27 08:53:53 +03:00
Mahmoud Zalt
506fe598cd Merge pull request #257 from zhqagp/master
Create README-zh.md
2016-08-27 08:46:16 +03:00
Eric Pfeiffer
b252558560 fix caddy Dockerfile from previous commit. 2016-08-26 14:01:48 -05:00
Eric Pfeiffer
29d714a849 caddy log to file. enable gzip compression. 2016-08-26 13:26:22 -05:00
Eric Pfeiffer
f9fd391879 update caddy to v0.9.1 2016-08-26 13:25:31 -05:00
Helson Taveras
740b4647a3 Laravel 5.3 is published officially
No need for development branch switch.

Ran into the same error posted by this guy here https://laracasts.com/discuss/channels/laravel/laravel-53-cant-do-php-artisan-optimize.

I didn't switch to the development branch and the setup worked perfectly.
2016-08-26 11:29:32 -04:00
zhqagp
f8d3c58d6a Create README-zh.md
中文翻译版README
2016-08-26 12:38:51 +08:00
Mahmoud Zalt
509cb9ac2e replace the phpmyadmin guide in the readme 2016-08-25 00:19:58 +03:00
Mahmoud Zalt
f2aea63d64 Merge pull request #250 from appleboy/patch-3
add phpMyAdmin document.
2016-08-25 00:10:52 +03:00
Bo-Yi Wu
12ba6bbbae add phpMyAdmin document.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-24 14:25:42 +08:00
Mahmoud Zalt
9fb50b2c6b fix phpmyadmin port. closes #247 2016-08-24 00:43:11 +03:00
Mahmoud Zalt
df1a019f75 Merge pull request #246 from appleboy/patch-2
update readme for phpMyAdmin.
2016-08-24 00:38:21 +03:00
Bo-Yi Wu
c68f70d2a7 fix typo
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-23 16:56:23 +08:00
Bo-Yi Wu
002b147b23 update readme for phpMyAdmin.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-23 16:56:14 +08:00
Mahmoud Zalt
314034255a Merge pull request #245 from appleboy/patch-1
Support phpMyAdmin container.
2016-08-22 22:32:52 +03:00
Bo-Yi Wu
3c8861d1d2 remove empty data folder for mariadb.
ref:
d969a465ee/10.1/Dockerfile (L83)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:02:21 +08:00
Bo-Yi Wu
2d51548879 support phpmyadmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:01:34 +08:00
Mahmoud Zalt
4aa3902f32 Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh
Install and start workspace ssh
2016-08-22 03:30:17 +03:00
Mahmoud Zalt
fb049ef300 create guides folder and clean the readme 2016-08-19 03:24:02 +03:00
Mahmoud Zalt
e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
Mahmoud Zalt
dd48592d8b update the xdebug.ini usage 2016-08-19 03:05:02 +03:00
Mahmoud Zalt
d57a0c3888 rename and refactor xdebug config files 2016-08-19 03:03:45 +03:00
Larry Eitel
7a13e4a343 Fix variable name 2016-08-17 19:53:01 -06:00
larryeitel
4e7e003e87 ssh keys 2016-08-17 19:24:00 -06:00
larryeitel
208b2e7c0a ReTweak README re xdebug 2016-08-17 07:56:38 -06:00
larryeitel
9611fdb58f Indent - Start/Stop xDebug in TOC 2016-08-17 07:56:38 -06:00
Mahmoud Zalt
9a77c8e276 Merge branch 'multi-sites' of https://github.com/tjb328/laradock into multiple-projects
* 'multi-sites' of https://github.com/tjb328/laradock:
  Fix typo
  Allow for config of crush and opcache in the main docker file
  This is a better Drupal nginx config. Built from a combination of contributions from here: https://groups.drupal.org/node/305633 https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
  Add Drush and Opcache to laradock because they are needed for drupal development.
  Add drupal 8 example to make laradock framework agnostic.
2016-08-17 01:53:55 +03:00