 Mahmoud ZaltandGitHub
|
3e61554625
|
Merge pull request #687 from jefhar/jefhar-patch-1
Jefhar patch 1
|
2017-03-17 11:09:45 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
6054c2d250
|
Merge pull request #686 from cjmaxik/patch-3
Update Dockerfile-71
|
2017-03-17 11:08:29 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
5589a12b9d
|
Merge pull request #691 from davidtaboas/patch-1
Fix Dockerfile-70
|
2017-03-17 11:07:36 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
e2384e2722
|
Merge pull request #689 from picospuch/patch-1
Update env-example
|
2017-03-17 11:07:21 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
d077085595
|
Merge pull request #688 from Mvzundert/master
re-added .gitignore for nginx dir, still do not want configs in git
|
2017-03-17 11:07:06 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
53f1032975
|
Merge pull request #673 from cabrerabywaters/PHP_WORKER
Php worker
|
2017-03-17 11:05:53 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
875ec23ade
|
Merge pull request #661 from g9308370/add_apache_vhost_conf
Add apache2 vhost ＆ example
|
2017-03-17 11:01:10 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
9e290ffddb
|
Merge pull request #680 from cjmaxik/feature-intl
Adding intl support to php-fpm container
|
2017-03-16 20:57:47 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
1c7e2e7d85
|
Merge pull request #684 from laradock/revert-639-master
Revert "Add apache conf file for specific virtualhost ServerName"
|
2017-03-16 14:41:12 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
1d6583e97e
|
Revert "Add apache conf file for specific virtualhost ServerName"
|
2017-03-16 14:40:45 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
1cf5bcde62
|
Merge pull request #682 from MauricioTRS/master
Elasticsearch - Fix plugins directory
|
2017-03-16 13:35:24 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
db40c67f75
|
Merge pull request #639 from tiknil/master
Add apache conf file for specific virtualhost ServerName
|
2017-03-16 13:30:14 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
e10ba9fa9f
|
Merge pull request #617 from alchimik/patch-1
don't load opcache extension twice
|
2017-03-16 13:28:28 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a42a295951
|
Merge pull request #485 from AliveCorpse/feature/workspace_with_php_7.1
Add dokerfile with php 7.1
|
2017-03-16 13:26:36 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
0678415663
|
Merge pull request #484 from AliveCorpse/feature/php_fpm_v7.1
Add dockerfile with php-fpm 7.1
|
2017-03-16 13:26:14 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
73a3745cc3
|
Merge pull request #370 from philtrep/certbot
Certbot container
|
2017-03-16 13:25:15 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
3f1d4b70a6
|
Merge pull request #650 from wayanjimmy/feature/mailhog
Add mailhog for mail debugging
|
2017-03-16 13:23:28 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
218ffe641e
|
Merge pull request #659 from thorerik/fix-issue-619
Fix issue 619
|
2017-03-16 13:21:17 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
be39e93ea2
|
Merge pull request #672 from cabrerabywaters/GOHSTSCRIPT_SUPPORT
Gohstscript support
|
2017-03-16 13:11:08 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
783c9321c9
|
Merge pull request #679 from davidvleung/master
Refine container name retrieval
|
2017-03-16 13:10:00 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
f61535427c
|
Merge pull request #677 from Mvzundert/multiple-projects-improvement
updated env-example and removed .env.example
|
2017-03-15 18:36:49 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
164b699f24
|
Merge pull request #653 from thorerik/add-minio
Add minio container
|
2017-03-06 09:37:56 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
97c9fbf469
|
update readme text
|
2017-02-22 16:45:46 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
edb32f5dd1
|
Merge pull request #629 from laradock/new-docs
New docs
|
2017-02-22 15:23:09 -05:00 |
|
|
Mahmoud Zalt
|
b995b3692e
|
Create CNAME
|
2017-02-22 09:32:40 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
ffdb35dc6a
|
Merge pull request #591 from abtrumpet/fix-soap
Fixed SOAP for both php-fpm and CLI
|
2017-02-07 18:27:31 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
c3f5dfa741
|
Add Mike Erickson to the Admins team
|
2017-02-03 15:28:27 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
6288935884
|
remove production-docker-compose.yml
We need to add the docs later.
Closes #524
|
2017-02-03 10:18:23 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
b10108a9b5
|
disable installing the bcmath by default
disable installing the PHP bcmath extension by default on the php-fpm container
|
2016-12-21 14:20:40 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
dd3e88fba9
|
Merge pull request #502 from laradock/support-bcmath-php-ext
Support bcmath php extension on php-fpm and workspace (base image 1.3)
|
2016-12-21 14:10:14 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
ecc4e06740
|
Merge pull request #432 from philtrep/port-already-allocated
Added 'port is already allocated' error to the docs debugging section
|
2016-11-15 09:20:37 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
380178e6fa
|
Merge pull request #429 from philtrep/mysql-bind-port
Added mysql change port bind documentation
|
2016-11-14 11:34:02 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
be64b54606
|
Merge pull request #428 from laradock/appleboy-patch-1
fixed #420 remove phpmyadmin volume setting.
|
2016-11-14 11:32:55 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
5e9ae56a7f
|
Merge pull request #419 from laradock/yarn
Revert #418 and fix install yarn package management.
|
2016-11-10 09:32:19 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
c5d1116333
|
Merge pull request #418 from moxar/yarn
Fix a bug that prevents yarn from installing #415
|
2016-11-09 15:17:42 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
fc31a2415c
|
Merge pull request #414 from joaojoyce/postgis-support
Postgis Support
|
2016-11-08 09:45:31 -05:00 |
|
|
Mahmoud ZaltandGitHub
|
3e4a5edc64
|
Merge pull request #407 from michaeljhopkins/patch-2
Add solution to mysql connection issues
|
2016-11-05 18:52:53 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
03bba8d2de
|
Merge pull request #400 from LaraDock/appleboy-patch-1
fix phpunit path for multiple project.
|
2016-10-31 21:32:33 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
3070eac7b7
|
Merge pull request #399 from LaraDock/multiple-projects
Multiple projects
|
2016-10-31 20:32:44 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a1ade52cd6
|
Merge pull request #369 from LaraDock/patch
fixed #363 PHP_IDE_CONFIG variable.
|
2016-10-31 08:08:48 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
05f4f371fe
|
Merge pull request #396 from LaraDock/appleboy-patch-1
Update caddy version and fix format.
|
2016-10-31 08:05:45 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
499342ea39
|
Merge pull request #391 from hopewise/master
clarified where to run xdebugPhpFpm command
|
2016-10-26 19:59:09 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
6a3137fc27
|
Merge pull request #388 from philtrep/ssh-documentation
Added Documentation for using ssh on workspace
|
2016-10-24 16:47:59 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
89fac4bdbe
|
Merge pull request #371 from imamassi/master
Quick steps to resolve connection refused error
|
2016-10-16 22:59:19 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
c4cd3ed2ac
|
Merge pull request #365 from geocine/nginx-charset-utf8
use utf8 charset on nginx
|
2016-10-14 14:31:56 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
bd1f6ebd8a
|
Merge pull request #364 from LaraDock/downgrade-mysql
downgrade MySQL to 5.6 (stable)
|
2016-10-14 12:28:42 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a2847316c4
|
Merge pull request #358 from appleboy/patch-22
convert tab to spaces.
|
2016-10-11 12:49:43 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
89a77bee24
|
Merge pull request #354 from philtrep/change-timezone
Added timezone arguments to workspace build
|
2016-10-10 10:44:30 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
58d6d8e745
|
Merge pull request #352 from LaraDock/revert-db-ports
Revert ports fowarding for MySQL and MariaDB
|
2016-10-09 16:52:29 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
942d1cfbed
|
Merge pull request #340 from philtrep/workspace-cron
Simple cron jobs
|
2016-10-03 23:24:31 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
57ec81ed52
|
Merge pull request #341 from rogeriopradoj/patch-1
Fix typo in README: Giude -> Guide
|
2016-10-03 23:23:33 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
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 ZaltandGitHub
|
3e2b413094
|
Merge pull request #338 from philtrep/master
Added NVM binaries in root bashrc
|
2016-10-03 15:43:43 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a0b75bac46
|
Merge pull request #328 from lukasoppermann/patch-1
Fixing typo
|
2016-09-26 21:11:46 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
b2aa38877b
|
Merge pull request #315 from mjcriswell/my-fix-branch
Windows Powershell command to enter container
|
2016-09-19 12:43:38 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
76afeedc33
|
Merge pull request #308 from francislavoie/patch-3
Fixes #305
|
2016-09-15 10:16:01 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
1b88c2c9d8
|
Merge pull request #303 from appleboy/patch-20
Revert #297 add mysql custom configuration file.
|
2016-09-11 03:14:18 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
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 |
|
|
Mahmoud ZaltandGitHub
|
15b3fe65c1
|
Merge pull request #297 from lialosiu/master
add build options MAX_ALLOWED_PACKET to mysql
|
2016-09-09 13:04:49 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a31cef6eb1
|
Merge pull request #294 from appleboy/patch-11
Support ElasticSearch Container
|
2016-09-07 09:42:09 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
a005281f4f
|
Merge pull request #291 from luciano-jr/feature/vue-cli-workspace
Feature/vue cli workspace
|
2016-09-07 09:42:03 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
53b0507eb2
|
Merge pull request #289 from Easter1021/patch-2
modify words in Chinese
|
2016-09-06 07:24:46 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
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 |
|
|
Mahmoud ZaltandGitHub
|
a9ecdd0008
|
Merge pull request #284 from appleboy/patch-1
Update postgres share volume path
|
2016-09-04 05:26:40 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
1dab0c48d8
|
Merge pull request #283 from appleboy/patch-10
Add pgAdmin container
|
2016-09-04 05:26:10 -04:00 |
|
|
Mahmoud ZaltandGitHub
|
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 |
|
|
Mahmoud ZaltandGitHub
|
3473b788cf
|
Merge pull request #275 from luciano-jr/feature/aerospike-cache
Feature/aerospike cache
|
2016-09-01 23:53:36 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
79ff092105
|
Merge pull request #273 from LarryEitel/fix-xdebugPhpFpm
fix-xdebugPhpFpm
|
2016-09-01 11:47:33 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
59a22aedac
|
Merge pull request #270 from LarryEitel/add_apt-get_update_to_workspace_install_xdebug_block
fix workspace xdebug install bug - need to add apt-get update.
|
2016-08-30 20:30:37 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
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 ZaltandGitHub
|
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 ZaltandGitHub
|
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 ZaltandGitHub
|
6dcb174012
|
Merge pull request #266 from bktz/master
Added support for RabbitMQ
|
2016-08-30 11:03:57 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
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 ZaltandGitHub
|
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 ZaltandGitHub
|
6c71d6d84f
|
Merge pull request #261 from appleboy/patch-4
support specific node version
|
2016-08-30 10:59:50 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
4e0af7e0cb
|
Merge pull request #259 from computerfr33k/master
Update caddy server and log to file
|
2016-08-27 08:54:35 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
d6b091df96
|
Merge pull request #258 from helsont/patch-1
Laravel 5.3 is published officially
|
2016-08-27 08:53:53 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
506fe598cd
|
Merge pull request #257 from zhqagp/master
Create README-zh.md
|
2016-08-27 08:46:16 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
f2aea63d64
|
Merge pull request #250 from appleboy/patch-3
add phpMyAdmin document.
|
2016-08-25 00:10:52 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
df1a019f75
|
Merge pull request #246 from appleboy/patch-2
update readme for phpMyAdmin.
|
2016-08-24 00:38:21 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
314034255a
|
Merge pull request #245 from appleboy/patch-1
Support phpMyAdmin container.
|
2016-08-22 22:32:52 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
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 ZaltandGitHub
|
5ee1fdd71b
|
Merge pull request #236 from LarryEitel/re-tweak-readme-xdebug
ReTweak README re xdebug
|
2016-08-16 18:43:46 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
b42f24c50d
|
Merge pull request #235 from LarryEitel/tweak-readme-xdebug
Indent - Start/Stop xDebug in TOC
|
2016-08-16 18:05:18 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
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 |
|
|
Mahmoud ZaltandGitHub
|
28b4077a49
|
Merge pull request #229 from Kauhat/patch-1
Remove hard-coded extensions from laravel.ini
|
2016-08-15 17:57:30 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
a30bf83269
|
Merge pull request #228 from lialosiu/master
add options INSTALL_ZIP_ARCHIVE to php-fpm
|
2016-08-14 15:46:52 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
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 |
|
|
Mahmoud ZaltandGitHub
|
27d3525469
|
Merge pull request #203 from davidavz/patch-1
Update README.md
|
2016-08-05 13:04:00 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
8b6fdfed76
|
Merge pull request #208 from davidavz/patch-3
Update README.md
|
2016-08-05 13:03:47 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
3c427d20c0
|
Merge pull request #204 from davidavz/patch-2
Update README.md
|
2016-08-05 13:03:35 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
537f2c5033
|
Merge pull request #198 from computerfr33k/master
minimize user switching in workspace build.
|
2016-07-29 18:24:03 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
f2615b9ff2
|
Merge pull request #194 from Kauhat/fix-composer
Fix user permissions issue when installing Composer in the workspace container
|
2016-07-29 14:01:48 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
04174b476c
|
Merge pull request #196 from LaraDock/LaraDock-Native
LaraDock Native (For Mac/Windows)
|
2016-07-29 13:55:23 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
2f20216d8f
|
Merge pull request #189 from computerfr33k/apache2
Add Apache2 Container
|
2016-07-28 07:38:41 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
33b701afdc
|
Merge pull request #188 from computerfr33k/workspace-user
Use workspace as non-root user
|
2016-07-27 12:56:19 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
5612874b78
|
Merge pull request #187 from LaraDock/faster-builds
Faster builds
|
2016-07-27 05:30:30 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
b1ec5b8d6f
|
Merge pull request #186 from computerfr33k/caddy
Update Caddyfile
|
2016-07-27 02:09:59 +03:00 |
|
|
Mahmoud ZaltandGitHub
|
6e07061deb
|
Merge pull request #184 from computerfr33k/nginx-alpine
Nginx alpine image
|
2016-07-27 02:09:00 +03:00 |
|