Commit Graph
100 Commits
Author SHA1 Message Date
Mahmoud ZaltandGitHub b1144bba7e Merge pull request #1069 from terryzwt/master
fixed #1068 drush need mysql-client installed
2017-07-26 20:08:03 +03:00
Mahmoud ZaltandGitHub d32cfb31b1 update ISSUE_TEMPLATE.md context 2017-07-26 02:42:24 +03:00
Mahmoud ZaltandGitHub e671f4c929 Update PULL_REQUEST_TEMPLATE.md context 2017-07-26 02:40:26 +03:00
Mahmoud ZaltandGitHub e7a16bb98e Merge pull request #1063 from St4inl3ss/remote_debug_documentation_phpStorm_linux
Xdebug configuration for Linux on PhpStorm
2017-07-21 10:58:44 +03:00
Mahmoud ZaltandGitHub f258b38a18 Merge pull request #1058 from arianacosta/integrating_docker_sync
Integrating docker sync
2017-07-16 22:26:08 +03:00
Mahmoud ZaltandGitHub b4ca9c5596 Create CONTRIBUTING.md 2017-07-13 04:15:09 +03:00
Mahmoud ZaltandGitHub d85b76f0d1 Merge pull request #1057 from laradock/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2017-07-13 04:09:20 +03:00
Mahmoud ZaltandGitHub f2a9712041 Create CODE_OF_CONDUCT.md 2017-07-13 04:08:59 +03:00
Mahmoud ZaltandGitHub 09bf0566af Adding Vince Chu to the team
Welcome @vwchu :)
2017-07-12 18:32:22 +03:00
Mahmoud ZaltandGitHub b8c5163c03 Merge pull request #1052 from ojhaujjwal/image-optimizers
image optimizer tools
2017-07-12 15:54:01 +03:00
Mahmoud ZaltandGitHub ca5a1ee674 Merge pull request #1043 from vwchu/feat-entrypoint-initdb
Parameterize docker-entrypoint-initdb.d for MySQL + MariaDB + Percona
2017-07-08 12:10:37 +03:00
Mahmoud ZaltandGitHub 0e93477db0 Merge pull request #1051 from ojhaujjwal/patch-1
fix php7.1-xdebug because of missing new line
2017-07-08 12:10:18 +03:00
Mahmoud ZaltandGitHub 422d6d8dd0 Merge pull request #1049 from igittGit/patch-2
Update Dockerfile-71
2017-07-07 14:33:29 +03:00
Mahmoud ZaltandGitHub d021777b06 Merge pull request #1044 from vwchu/fix-1041
fix #1041
2017-07-07 14:33:03 +03:00
Mahmoud ZaltandGitHub bf60f7520b Merge pull request #1038 from vwchu/master
add APACHE_SITES_PATH variable
2017-07-04 07:25:40 +03:00
Mahmoud ZaltandGitHub 916e9f38f3 Merge pull request #1022 from ItaloBC/patch-3
ElasticSearch instance fails at loading (missing parameters)
2017-07-04 07:25:20 +03:00
Mahmoud ZaltandGitHub ebc24ced66 Merge pull request #1000 from zuohuadong/patch-4
Fix pgadmin can't boot
2017-07-04 07:23:08 +03:00
Mahmoud ZaltandGitHub 094aa9beb1 Merge pull request #1040 from sakanaproductions/fix-1017
fixed issue #1017, added ENV variables back to Dockerfile and added …
2017-07-04 00:36:06 +03:00
Mahmoud ZaltandGitHub ab464d93d3 Merge pull request #1016 from ardziej/patch-2
Added TZ environment for MySQL Container
2017-06-13 05:59:59 +03:00
Mahmoud ZaltandGitHub 26ee54a4ad Merge pull request #992 from zuohuadong/patch-3
git key  to pull code
2017-06-07 09:42:47 +03:00
Mahmoud ZaltandGitHub 18b6c1b907 Merge pull request #984 from Obscuresounds/workspace-fix-bash-command-not-found
Exec issue with workspace bugfix
2017-05-30 17:51:05 +03:00
Mahmoud ZaltandGitHub 4a663649c0 Merge pull request #983 from cre8/master
Add laravel echo server
2017-05-30 17:50:08 +03:00
Mahmoud ZaltandGitHub 7c9d7a6de6 Merge pull request #965 from aven-li/master
fix mongodb php extension config
2017-05-30 17:49:33 +03:00
Mahmoud ZaltandGitHub d0e5d50712 Update readme 2017-05-30 17:41:11 +03:00
Mahmoud ZaltandGitHub 895a24f332 Adding amazing members to the Laradock team
Welcome @sixlive and @bestlong :)
2017-05-13 17:41:44 +03:00
Mahmoud ZaltandGitHub 109e596417 Merge pull request #937 from bestlong/fix-percona-create-multiple-db-user-cant-see
Fixing Percona service create multiple db solution
2017-05-13 16:47:43 +03:00
Mahmoud ZaltandGitHub be9f7f8346 Merge pull request #935 from xpert13/patch-1
Fix #934. Add extra_hosts to php-worker container
2017-05-13 05:48:25 +03:00
Mahmoud ZaltandGitHub b5431bc061 Merge pull request #933 from bestlong/php-fpm-ldap-support
php-fpm service LDAP support
2017-05-13 05:48:06 +03:00
Mahmoud ZaltandGitHub 783da59b59 Merge pull request #929 from ciliehub/master
correct xdebug sed in workspace
2017-05-13 05:47:33 +03:00
Mahmoud ZaltandGitHub c1a2f4b2a8 Merge pull request #844 from zuohuadong/master
Fix git's BUG & add plugin
2017-04-21 23:53:25 -04:00
Mahmoud ZaltandGitHub a44cae4408 Merge pull request #841 from zuohuadong/master
update cadddy version to 0.10.0
2017-04-21 13:48:07 -04:00
Mahmoud ZaltandGitHub 0f7b6bab6b Merge pull request #836 from dtunes/feature_blackfire_container
Feature blackfire container
2017-04-20 19:11:58 -04:00
Mahmoud ZaltandGitHub c5105c29b6 Merge pull request #834 from xbojch/libicu-dev-not-found
Run apt-get update before installing intl extension
2017-04-20 13:46:02 -04:00
Mahmoud ZaltandGitHub a6ff3d0666 Merge pull request #831 from bestlong/fix-pgadmin-host-name-not-resolve
Fixing Unable to connect to postgresql server
2017-04-20 13:14:52 -04:00
Mahmoud ZaltandGitHub f30e36bc93 Merge pull request #825 from bestlong/install-all-ext-for-ci-build
Install all ext to run CI build.
2017-04-18 11:32:51 -04:00
Mahmoud ZaltandGitHub b9716e7fef Merge pull request #821 from computerfr33k/master
Revert to Hugo v0.19
2017-04-18 11:30:53 -04:00
Mahmoud ZaltandGitHub 5b9dd242f3 Merge pull request #819 from dtunes/master
Added percona container
2017-04-17 19:52:04 -04:00
Mahmoud ZaltandGitHub df87c3e36b Merge pull request #817 from laradock/winfried-van-loon-patch-1
Fixing typo in docs menu
2017-04-17 17:16:26 -04:00
Mahmoud ZaltandGitHub 73ebc1effa Merge pull request #815 from bestlong/fix-adminer-login-fail
Fixing Adminer can’t login
2017-04-17 11:22:50 -04:00
Mahmoud ZaltandGitHub bb8bf6ae10 Merge pull request #812 from bestlong/add-travis-ci-build-status-image
Add Travis CI status image.
2017-04-17 11:22:33 -04:00
Mahmoud ZaltandGitHub 8ffb0ff3e3 Merge pull request #810 from wxb/master
set data save path(mysql/redis/memcached..)
2017-04-16 11:51:32 -04:00
Mahmoud ZaltandGitHub f3598c3c97 Merge pull request #805 from bestlong/fixing-php-fpm-ghostscript
Fixing php fpm ghostscript
2017-04-14 03:24:54 -04:00
Mahmoud ZaltandGitHub c78eb5228a Merge pull request #803 from activeobjects/master
Added support for jenkins official container
2017-04-13 11:48:57 -04:00
Mahmoud ZaltandGitHub 43e2b3e403 Merge pull request #795 from hounded/master
pdo_dblib
2017-04-12 00:53:51 -04:00
Mahmoud ZaltandGitHub f69422e82f Merge branch 'master' into master 2017-04-12 00:53:43 -04:00
Mahmoud ZaltandGitHub f991123545 Merge pull request #788 from laradock/575-php-fpm-exif
Adding exif/redis to php-fpm 56 and 71
2017-04-11 15:01:43 -04:00
Mahmoud ZaltandGitHub a35287b367 Merge pull request #785 from winfried-van-loon/690-php-fpm-intl
Fixing INTL ext in php-fpm for php71
2017-04-11 13:24:43 -04:00
Mahmoud ZaltandGitHub ddabb4620e Merge pull request #784 from winfried-van-loon/645-php-fpm-ghostscript
Fixing ghostscript env option
2017-04-11 13:24:29 -04:00
Mahmoud ZaltandGitHub b86211d2d8 Merge pull request #781 from winfried-van-loon/764-780-php-fpm-mysql
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:23:45 -04:00
Mahmoud ZaltandGitHub 0b414813aa Merge pull request #777 from bestlong/patch-1
use PHP71 build workspace get ERROR
2017-04-11 13:23:33 -04:00
Mahmoud ZaltandGitHub ea354cf035 Update readme add: Winfried van Loon as Admin 2017-04-09 14:43:46 -04:00
Mahmoud ZaltandGitHub f8fd92fb0a Merge pull request #766 from BrianDGLS/patch-1
fix typo in README.md
2017-04-09 12:26:41 -04:00
Mahmoud ZaltandGitHub 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 ZaltandGitHub 6e1911bdd5 Merge pull request #758 from hounded/master
MySQL fix
2017-04-07 11:27:32 -04:00
Mahmoud ZaltandGitHub 13891a52dd Merge pull request #757 from hounded/master
Symfony support in workspace
2017-04-06 20:12:19 -04:00
Mahmoud ZaltandGitHub 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
Mahmoud ZaltandGitHub 5cd6ea41f9 Merge pull request #751 from david-perez/master
Fix PHP Zip library installation
2017-04-05 20:54:17 -04:00
Mahmoud ZaltandGitHub 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 ZaltandGitHub 18b38db037 Merge pull request #742 from winfried-van-loon/patch-1
Updating the DigitalOcean guide
2017-04-04 20:47:52 -04:00
Mahmoud ZaltandGitHub 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 ZaltandGitHub 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 ZaltandGitHub 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
Mahmoud ZaltandGitHub b0831240b1 Merge pull request #737 from winfried-van-loon/master
Fixing MariaDB root password variable. #736
2017-04-03 22:10:39 -04:00
Mahmoud ZaltandGitHub 2b11fc2299 Merge pull request #732 from cjmaxik/patch-4
Update supervisord.conf
2017-04-03 09:56:13 -04:00
Mahmoud ZaltandGitHub 754ca4cd4f Merge pull request #730 from partounian/patch-1
Correct Supported Software list bullet points
2017-04-03 09:55:42 -04:00
Mahmoud ZaltandGitHub 10e3dc16d2 Merge pull request #729 from innerspirit/master
Marked toolbox as outdated in docs
2017-04-03 09:55:25 -04:00
Mahmoud ZaltandGitHub e23c6dae90 Merge pull request #717 from zeroc0d3/proxy
Merge with Proxy branch
2017-04-03 09:54:27 -04:00
Mahmoud ZaltandGitHub 170a1efeb1 Merge pull request #727 from partounian/master
Add Adminer container
2017-03-31 00:35:40 -04:00
Mahmoud ZaltandGitHub 50e3d1667f Merge pull request #726 from innerspirit/master
Fixed typo
2017-03-31 00:30:31 -04:00
Mahmoud ZaltandGitHub f05512fd1d update readme 2017-03-29 10:08:55 -04:00
Mahmoud ZaltandGitHub 6fa6d02360 Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
Mahmoud ZaltandGitHub e588f261f8 Merge pull request #708 from thorerik/fix-yarn-again
fix yarn again after #662 reverted it
2017-03-25 16:55:17 -04:00
Mahmoud ZaltandGitHub a0da2c0ea0 Update readme
Add @zeroc0d3 to the maintainers team :)
2017-03-24 19:54:36 -04:00
Mahmoud ZaltandGitHub 8315a3872d Merge pull request #662 from zeroc0d3/master
Fixing environment in docker-compose file
2017-03-22 10:14:00 -04:00
Mahmoud ZaltandGitHub 53b73798d3 Merge pull request #704 from Mvzundert/master
Fixed path variable for windows users
2017-03-21 09:59:57 -04:00
Mahmoud ZaltandGitHub 9096737aa7 Merge pull request #694 from Mvzundert/master
Docker-71 and Nginx examples
2017-03-20 13:22:49 -04:00
Mahmoud ZaltandGitHub 3429681f2c Merge pull request #670 from cabrerabywaters/MSSQL_SUPPORT
Mssql support
2017-03-20 13:20:08 -04:00
Mahmoud ZaltandGitHub d4c727bb2d Merge pull request #700 from picospuch/master
fix some errors in mysql setup file for latest mysql image
2017-03-20 13:16:05 -04:00
Mahmoud ZaltandGitHub 1ae104167a Merge pull request #701 from thorerik/fix-yarn
Fix yarn installation
2017-03-20 13:15:39 -04:00
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