Commit Graph

445 Commits

Author SHA1 Message Date
Philippe Trépanier
2396b4799c Merge pull request #350 from geocine/cannot-open-nvm-sh-fix
fix for issue #347
2016-10-09 13:12:19 -04:00
Aivan Monceller
08fa1bc95c fix for issue #347 2016-10-10 01:06:10 +08:00
Mahmoud Zalt
2415566230 general updates to the readme 2016-10-09 02:26:50 -04:00
Bo-Yi Wu
5fea003ffe update installation. 2016-10-09 11:19:50 +08:00
Mahmoud Zalt
e9af2a4fb3 Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
  Fix typo in README: Giude -> Guide
  Added laravel cronjob
  Added cron files copying to workspace crontab
  Remove port fowarding for MySQL and MariaDB
  Added NVM binaries in root bashrc
2016-10-06 17:57:18 -04:00
Mahmoud Zalt
d0dea21cc5 update readme credits section 2016-10-06 17:55:41 -04:00
Mahmoud Zalt
942d1cfbed Merge pull request #340 from philtrep/workspace-cron
Simple cron jobs
2016-10-03 23:24:31 -04:00
Mahmoud Zalt
57ec81ed52 Merge pull request #341 from rogeriopradoj/patch-1
Fix typo in README: Giude -> Guide
2016-10-03 23:23:33 -04:00
Rogerio Prado de Jesus
8d62070773 Fix typo in README: Giude -> Guide 2016-10-03 23:51:48 -03:00
philtrep
8933b827b3 Added laravel cronjob 2016-10-03 20:29:45 -04:00
philtrep
6f435584a9 Added cron files copying to workspace crontab 2016-10-03 20:21:28 -04:00
Mahmoud Zalt
a1fd2aabcd Merge pull request #339 from philtrep/expose-database-ports
Remove port fowarding for MySQL and MariaDB
2016-10-03 17:01:37 -04:00
Mahmoud Zalt
3e2b413094 Merge pull request #338 from philtrep/master
Added NVM binaries in root bashrc
2016-10-03 15:43:43 -04:00
philtrep
ec3ebb9701 Remove port fowarding for MySQL and MariaDB 2016-10-03 13:25:34 -04:00
philtrep
cfc48b3791 Added NVM binaries in root bashrc 2016-10-03 13:10:31 -04:00
Mahmoud Zalt
3725ad4c46 edit readme: adding Admins list 2016-09-27 19:10:20 -04:00
Mahmoud Zalt
a0b75bac46 Merge pull request #328 from lukasoppermann/patch-1
Fixing typo
2016-09-26 21:11:46 -04:00
Lukas Oppermann
489740848f Fixing typo
Software has no different plural form.
2016-09-24 08:57:47 +02:00
Mahmoud Zalt
b2aa38877b Merge pull request #315 from mjcriswell/my-fix-branch
Windows Powershell command to enter container
2016-09-19 12:43:38 -04:00
Michael Criswell
51703f00fc Windows Powershell command to enter container
Allows a Windows Powershell user to enter a running container to avoid the following error message.
Interactive mode is not yet supported on Windows.
Please pass the -d flag when using `docker-compose exec`.
2016-09-16 13:51:19 -07:00
Mahmoud Zalt
f1716a2767 update readme, add more awesome contributors 2016-09-15 10:48:20 -04:00
Mahmoud Zalt
5640bd963d Activating OpCache
Closes #307
2016-09-15 10:47:58 -04:00
Mahmoud Zalt
8bb69beb84 t fetch Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
  Fixes #305
  add mysql custom configuration file.
  fix php warning "Unable to load dynamic library '/usr/lib/php/20151012/aerospike.so'" when aerospike set not install at workspace
  add build options MAX_ALLOWED_PACKET to mysql
  update readme for ElasticSearch.
  Support ElasticSearch Container.
  Add vue-cli on workspace npm global installers
  modify words in Chinese
  Add aerospike extension installation on phpfpm-56 as well
2016-09-15 10:24:51 -04:00
Mahmoud Zalt
76afeedc33 Merge pull request #308 from francislavoie/patch-3
Fixes #305
2016-09-15 10:16:01 -04:00
Francis Lavoie
16b6223ba9 Fixes #305 2016-09-13 21:40:03 -04:00
Mahmoud Zalt
1b88c2c9d8 Merge pull request #303 from appleboy/patch-20
Revert #297 add mysql custom configuration file.
2016-09-11 03:14:18 -04:00
Bo-Yi Wu
b254d4a9c9 add mysql custom configuration file.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-11 08:39:25 +08:00
Mahmoud Zalt
2ed475f1ef Merge pull request #300 from lialosiu/master
fix php warning in Workspace: "Unable to load dynamic library aerospike"
2016-09-10 17:48:24 -04:00
Lialosiu
3a5100097a fix php warning "Unable to load dynamic library '/usr/lib/php/20151012/aerospike.so'" when aerospike set not install at workspace 2016-09-10 16:53:15 +08:00
Mahmoud Zalt
15b3fe65c1 Merge pull request #297 from lialosiu/master
add build options MAX_ALLOWED_PACKET to mysql
2016-09-09 13:04:49 -04:00
Lialosiu
da6face95e add build options MAX_ALLOWED_PACKET to mysql 2016-09-09 10:21:33 +08:00
Mahmoud Zalt
a31cef6eb1 Merge pull request #294 from appleboy/patch-11
Support ElasticSearch Container
2016-09-07 09:42:09 -04:00
Mahmoud Zalt
a005281f4f Merge pull request #291 from luciano-jr/feature/vue-cli-workspace
Feature/vue cli workspace
2016-09-07 09:42:03 -04:00
Bo-Yi Wu
907c694834 update readme for ElasticSearch.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-07 16:44:33 +08:00
Bo-Yi Wu
8c392e94f2 Support ElasticSearch Container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-07 15:18:54 +08:00
Luciano Gonçalves
d538274a0f Add vue-cli on workspace npm global installers 2016-09-06 23:43:03 +01:00
Luciano Jr
beeea8dc0e Merge pull request #12 from LaraDock/master
Update fork
2016-09-06 22:14:21 +01:00
Mahmoud Zalt
53b0507eb2 Merge pull request #289 from Easter1021/patch-2
modify words in Chinese
2016-09-06 07:24:46 -04:00
許益銘
a1a5b3d49f modify words in Chinese
let words look like smooth and replace wrong word in Chinese.
2016-09-06 17:46:14 +08:00
Mahmoud Zalt
4f5dfbcb13 Merge pull request #287 from luciano-jr/bugfix/php-fpm5.6-aerospike
Bugfix/php fpm5.6 aerospike
2016-09-05 21:58:09 -04:00
Luciano Jr
f275f88396 Merge pull request #11 from luciano-jr/bugfix/php-fpm5.6-aerospike
Add aerospike extension installation on phpfpm-56 as well
2016-09-04 14:55:12 +01:00
Luciano Gonçalves
6cc58de67e Add aerospike extension installation on phpfpm-56 as well 2016-09-04 14:50:03 +01:00
Luciano Jr
b2da8aeb3f Merge pull request #10 from LaraDock/master
Update fork
2016-09-04 14:36:12 +01:00
Mahmoud Zalt
1345164ac3 refactor RabbitMQ Dockerfile 2016-09-04 06:33:08 -04:00
Mahmoud Zalt
a9ecdd0008 Merge pull request #284 from appleboy/patch-1
Update postgres share volume path
2016-09-04 05:26:40 -04:00
Mahmoud Zalt
1dab0c48d8 Merge pull request #283 from appleboy/patch-10
Add pgAdmin container
2016-09-04 05:26:10 -04:00
Mahmoud Zalt
91f1d4347c Merge pull request #278 from LarryEitel/remove-port-22-from-docker-compose-php-fpm
remove port 22 from php-fpm because of conflict
2016-09-04 05:22:30 -04:00
Bo-Yi Wu
4013553dbb Update postgres share volume path 2016-09-04 09:04:18 +08:00
Bo-Yi Wu
07e4bd174e Add pgAdmin doc.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-03 21:32:02 +08:00
Bo-Yi Wu
7999399e9a Add pgAdmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-03 21:24:36 +08:00