Commit Graph

337 Commits

Author SHA1 Message Date
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
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
Mahmoud Zalt
080cc2a88a Merge branch 'master' of https://github.com/LaraDock/laradock into multiple-projects
* 'master' of https://github.com/LaraDock/laradock:
  ReTweak README re xdebug
  Indent - Start/Stop xDebug in TOC
2016-08-17 01:52:55 +03:00
Tim Bracken
b648f1ca58 Fix typo 2016-08-16 17:53:15 -04:00
Tim Bracken
cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Tim Bracken
928451ae88 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/
2016-08-16 16:32:59 -04:00
Tim Bracken
95ef5e1e70 Add Drush and Opcache to laradock because they are needed for drupal development. 2016-08-16 15:13:58 -04:00
Tim Bracken
c324114b7a Add drupal 8 example to make laradock framework agnostic. 2016-08-16 15:08:27 -04:00
Mahmoud Zalt
5ee1fdd71b Merge pull request #236 from LarryEitel/re-tweak-readme-xdebug
ReTweak README re xdebug
2016-08-16 18:43:46 +03:00
larryeitel
7680e29bc5 ReTweak README re xdebug 2016-08-16 09:23:56 -06:00
Mahmoud Zalt
b42f24c50d Merge pull request #235 from LarryEitel/tweak-readme-xdebug
Indent - Start/Stop xDebug in TOC
2016-08-16 18:05:18 +03:00
larryeitel
1c22c009e7 Indent - Start/Stop xDebug in TOC 2016-08-16 08:55:29 -06:00
Mahmoud Zalt
380c7bd1ec Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock:
  Proof of concept - LaraDock hosting multiple sites
2016-08-16 15:56:19 +03:00
Mahmoud Zalt
e8562272b0 update the readme: update contributing giude 2016-08-16 15:47:42 +03:00
Mahmoud Zalt
1614f0fb2d update the readme: add production section (with DO) 2016-08-16 15:38:01 +03:00
Mahmoud Zalt
5232d6a84f update the readme: add xDebug docs 2016-08-16 15:28:30 +03:00
Mahmoud Zalt
391602a811 Merge branch 'LarryEitel-xdebugPhpFpm'
* LarryEitel-xdebugPhpFpm:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:16:01 +03:00
Mahmoud Zalt
b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:13:42 +03:00
Mahmoud Zalt
aabb0cded8 upgrade php-fpm base image 2016-08-16 15:12:52 +03:00
Mahmoud Zalt
d3a6116a42 move PHP Memcached from the base image to LaraDock 2016-08-16 15:12:35 +03:00
Mahmoud Zalt
eb81dfc1be Merge pull request #232 from tianissimo/dev-memcached-ext
Added PHP Memcached extension installation for PHP 5.6
2016-08-16 13:33:46 +03:00
Suteepat Damrongyingsupab
a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel
93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
larryeitel
d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Mahmoud Zalt
28b4077a49 Merge pull request #229 from Kauhat/patch-1
Remove hard-coded extensions from laravel.ini
2016-08-15 17:57:30 +03:00
Jack Fletcher
651430c7a9 Update Dockerfile-56 2016-08-15 15:01:47 +01:00
Jack Fletcher
3be9dee1c7 Update Dockerfile-70 2016-08-15 15:00:37 +01:00
Jack Fletcher
8ef37a71fb Remove hard-coded extensions from laravel.ini 2016-08-15 14:57:51 +01:00
Mahmoud Zalt
a30bf83269 Merge pull request #228 from lialosiu/master
add options INSTALL_ZIP_ARCHIVE to php-fpm
2016-08-14 15:46:52 +03:00
Lialosiu
1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Mahmoud Zalt
82cbad75d4 Update the reamde: list more awesome contributors 2016-08-11 21:24:20 +03:00
Mahmoud Zalt
6111ca5ff7 Merge pull request #222 from tianissimo/dev-workspace-node-fix
Fixed nvm/node installation not working.
2016-08-11 21:14:39 +03:00
Suteepat Damrongyingsupab
b393996d44 Fixed nvm/node installation not working. 2016-08-11 18:03:27 +07:00
Mahmoud Zalt
f12028576c upgrade the workspace base image to 1.1 2016-08-10 22:25:41 +03:00
Mahmoud Zalt
27d3525469 Merge pull request #203 from davidavz/patch-1
Update README.md
2016-08-05 13:04:00 +03:00
Mahmoud Zalt
8b6fdfed76 Merge pull request #208 from davidavz/patch-3
Update README.md
2016-08-05 13:03:47 +03:00