Commit Graph
100 Commits
Author SHA1 Message Date
Mahmoud ZaltandGitHub 265bc13917 Merge pull request #1251 from mouyong/master
Set environment to change source.
2017-11-23 20:12:11 +02:00
Mahmoud ZaltandGitHub 9b8d4806a8 Merge pull request #1265 from jeff-h/master1
Specifying included docker-compose files in the .env is more flexible
2017-11-22 20:15:07 +02:00
Mahmoud ZaltandGitHub 65a8bbc6a4 Merge pull request #1262 from jeff-h/issue-171
Fixes #353 and allows easier dev & prod environments
2017-11-21 22:56:04 +02:00
Mahmoud ZaltandGitHub 7c1f3060bf Merge pull request #1257 from nellonican/hotfix
Remove python installation from Dockerfile-71
2017-11-21 22:55:33 +02:00
Mahmoud ZaltandGitHub 45e1ecf3c0 Merge pull request #1256 from ricardoseriani/remove-the-github-paragraph-on-header
Remove the github paragraph on header
2017-11-21 22:54:54 +02:00
Mahmoud ZaltandGitHub c6b1eb016d Merge pull request #1255 from zuohuadong/patch-23
Remove useless...
2017-11-21 22:53:32 +02:00
Mahmoud ZaltandGitHub c5005f54f7 Merge pull request #1254 from zuohuadong/patch-22
add git  & Chinese users friendly.
2017-11-21 22:53:19 +02:00
Mahmoud ZaltandGitHub 9877f0453e Merge pull request #1253 from gbroques/fix-logo-covers-links-in-mobile-drawer-menu
Fix logo covering links in mobile drawer menu (Closes #1252)
2017-11-14 22:28:49 +02:00
Mahmoud ZaltandGitHub 6c3b18340f Merge pull request #1248 from mariano-dagostino/fix1247
Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog
2017-11-13 20:27:21 +02:00
Mahmoud ZaltandGitHub de247a074e Merge pull request #1246 from axit-joost/master
Fixes laradock/laradock#1245 by adding python to the image
2017-11-13 20:27:07 +02:00
Mahmoud ZaltandGitHub 176dd74906 Merge pull request #1244 from zuohuadong/patch-21
upgrade  Description
2017-11-13 20:26:54 +02:00
Mahmoud ZaltandGitHub 819b1eb3bc Merge pull request #1243 from zuohuadong/patch-20
fix pgadmin-backup
2017-11-13 20:26:33 +02:00
Mahmoud ZaltandGitHub f7ac8cf862 Merge pull request #1241 from nellonican/master
Fix Dockerfile
2017-11-12 20:56:40 +02:00
Mahmoud ZaltandGitHub 35183eff42 Merge pull request #1240 from JeromeDesseaux/master
solving python issue when using INSTALL_NODE=true and VueJS with Laravel.
2017-11-12 18:17:45 +02:00
Mahmoud ZaltandGitHub 46852bc31b Merge pull request #1232 from zuohuadong/patch-17
Update Dockerfile-71
2017-11-08 05:24:42 +02:00
Mahmoud ZaltandGitHub 5a21337cc5 Merge pull request #1231 from zuohuadong/patch-16
Update Dockerfile-70
2017-11-08 05:24:34 +02:00
Mahmoud ZaltandGitHub e2091cd309 Merge pull request #1234 from zuohuadong/patch-19
fix error
2017-11-08 05:24:08 +02:00
Mahmoud ZaltandGitHub 1ead8aa060 Merge pull request #1228 from JeroenVanOort/master
added IMAP extension to workspace
2017-11-08 05:19:08 +02:00
Mahmoud ZaltandGitHub 4e486280f4 Merge pull request #1219 from NickToony/master
Fixed: Missing PgSQL PDO drivers
2017-10-29 20:14:31 +02:00
Mahmoud ZaltandGitHub 152c896515 Merge pull request #1210 from nellonican/fix-env-vars
Fix variable issues.
2017-10-25 15:36:27 +03:00
Mahmoud ZaltandGitHub 4682aff622 Merge pull request #1209 from nellonican/fix-grammar
Fix grammar
2017-10-25 15:35:49 +03:00
Mahmoud ZaltandGitHub c05c675408 Merge pull request #1201 from geraintdong/Add_pg_client_to_workspace_phpfpm
Add pg client to workspace phpfpm
2017-10-25 01:05:29 +03:00
Mahmoud ZaltandGitHub 05879bdda2 Merge pull request #1203 from arkadiusjonczek/master
Add Grafana container under Random Tools in introduction documentation
2017-10-20 06:14:13 +03:00
Mahmoud ZaltandGitHub 9fa3733622 Merge pull request #1202 from arkadiusjonczek/master
Add Grafana Container to laradock.io :)
2017-10-19 19:41:51 +03:00
Mahmoud ZaltandGitHub 3005dde240 Merge pull request #1200 from TitasGailius/master
Use node:alpine image for laravel-echo-server
2017-10-18 22:15:42 +03:00
Mahmoud ZaltandGitHub b3922995e1 Merge pull request #1199 from zuohuadong/master
add postgres for php-fpm
2017-10-18 22:15:22 +03:00
Mahmoud ZaltandGitHub a5c505bf28 Merge pull request #1181 from zuohuadong/patch-9
use caddy in Apache-2.0
2017-10-14 22:33:43 +03:00
Mahmoud ZaltandGitHub 427088e11b Merge pull request #1189 from maxhelias/feature/maildev
Add MailDev Container
2017-10-14 22:32:19 +03:00
Mahmoud ZaltandGitHub 3467821c28 Merge pull request #1184 from zuohuadong/patch-12
alpine be quckly
2017-10-14 22:31:51 +03:00
Mahmoud ZaltandGitHub f9553dff4c Merge pull request #1183 from zuohuadong/patch-11
update jenkins version
2017-10-14 22:31:23 +03:00
Mahmoud ZaltandGitHub 903c77421c Merge pull request #1182 from khoanguyen96/fix-typos-contributing
fix typos in contributing
2017-10-12 05:47:33 +03:00
Mahmoud ZaltandGitHub 01c358b6bc Merge pull request #1176 from taufek/tj-chrome-driver-var
Move Chrome Driver Version to Env
2017-10-06 20:44:30 +03:00
Mahmoud ZaltandGitHub a0685705c0 Merge pull request #1175 from taufek/tj-dusk-doc-2
Update Dusk Documentation
2017-10-06 20:43:40 +03:00
Mahmoud ZaltandGitHub a2edf57e3b Merge pull request #1172 from taufek/tj-chrome-for-dusk
Install Dependencies to Run Dusk Tests
2017-10-03 11:43:49 +03:00
Mahmoud ZaltandGitHub 6cff904eba Merge pull request #1170 from id2s/feature-php-ldap-workspace
Add PHP LDAP extension if needed
2017-09-29 20:15:46 +03:00
Mahmoud ZaltandGitHub 1281490c39 Merge pull request #1168 from nunomazer/master
Add pecl before mongo install on Dockerfile-56 to stop mongodb breaking building
2017-09-29 00:57:45 +03:00
Mahmoud ZaltandGitHub 615cb72eab Merge pull request #1167 from ifdattic/patch-1
Fix typo
2017-09-28 19:22:37 +03:00
Mahmoud ZaltandGitHub 8989c73711 Merge pull request #1163 from luciano-jr/FixAerospikeClientLink
Fix aerospike client link
2017-09-25 23:32:49 +03:00
Mahmoud ZaltandGitHub 5a073ae841 Merge pull request #1158 from taufek/tj-aliases-update
Add artisan aliases
2017-09-25 01:16:41 +03:00
Mahmoud ZaltandGitHub c0e823b8d2 Merge pull request #1153 from taufek/tj-terraform
Add Terraform to Workspace
2017-09-24 00:56:25 +03:00
Mahmoud ZaltandGitHub f765afd4c2 Merge pull request #1151 from luciano-jr/AddAerospikeExtensionOnPhpFpm
Add aerospike.so line to be load on php-fpm
2017-09-22 19:32:19 +03:00
Mahmoud ZaltandGitHub 6ea49a0683 Merge pull request #1150 from samdark/fix-typo
Fixed typo in "nginx"
2017-09-22 19:31:55 +03:00
Mahmoud ZaltandGitHub 53b7f75500 Merge pull request #1145 from vjekoslav/master
Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca…
2017-09-20 20:09:47 +03:00
Mahmoud ZaltandGitHub d340b6e60f Merge pull request #1140 from deleugpn/patch-1
Make it easier to solve nginx build stuck
2017-09-19 01:39:15 +03:00
Mahmoud ZaltandGitHub e7357eab83 Merge pull request #1142 from roelal/apache_socket_timeout
add APACHE_PHP_UPSTREAM_TIMEOUT
2017-09-19 01:38:28 +03:00
Mahmoud ZaltandGitHub ae048e6c66 Merge pull request #1137 from JoelRSimpson/patch-1
Update docker-compose.yml
2017-09-15 22:08:55 +03:00
Mahmoud ZaltandGitHub 655b9a1526 Merge pull request #1128 from chkm8/aws-ebcli
Aws ebcli
2017-09-13 00:17:05 +03:00
Mahmoud ZaltandGitHub 801ccd47d2 Merge pull request #1121 from freearhey/master
Added support of ImageMagick
2017-09-06 14:59:29 +03:00
Mahmoud ZaltandGitHub e9806d9bca Merge pull request #1120 from WanchiaTsai/add-env-path-for-node
add ENV PATH, fix the problem of docker-compose exec workspace npm(or…
2017-09-05 16:30:44 +03:00
Mahmoud ZaltandGitHub 8485add87a Merge pull request #1117 from masterjus/fix-php_redis-installation
Fix Php Redis extension installation
2017-09-04 22:40:21 +03:00
Mahmoud ZaltandGitHub fdcf9117ac Merge pull request #1115 from joaorobertopb/patch-1
Changes to correct version of dockerfile
2017-08-30 01:07:37 +03:00
Mahmoud ZaltandGitHub a1d3eeb7e6 Merge pull request #1107 from oaattia/master
Can't create/write to file '/var/lib/mysql/is_writable'
2017-08-23 21:14:29 +03:00
Mahmoud ZaltandGitHub b2f7348552 Merge pull request #1101 from terryzwt/drpual-console
add drupal console to workspace
2017-08-23 21:14:13 +03:00
Mahmoud ZaltandGitHub ebeddcba23 Merge pull request #1097 from macghriogair/master
[php-worker] dedicated dockerfile for php 7.0/7.1
2017-08-23 21:11:45 +03:00
Mahmoud ZaltandGitHub dba37307b5 Merge pull request #1093 from zuohuadong/patch-7
fix to backup and fix max client
2017-08-23 21:11:02 +03:00
Mahmoud ZaltandGitHub 38fb49bccc Merge pull request #1095 from exfriend/patch-2
Fix supervisord.conf file path
2017-08-17 04:37:18 +03:00
Mahmoud ZaltandGitHub dcab211b07 Merge pull request #1094 from zuohuadong/patch-8
add pgadmin backup volumes
2017-08-14 23:53:31 +03:00
Mahmoud ZaltandGitHub 586a225c11 Merge pull request #1089 from ELD/add-dusk-support-and-docs
add docs on running Laravel Dusk tests
2017-08-11 10:26:31 +03:00
Mahmoud ZaltandGitHub 245ddf3441 update documentation link in the readme 2017-08-09 16:18:29 +03:00
Mahmoud ZaltandGitHub 0192346cf2 Merge pull request #1082 from arywidiantara/master
[UPDATE] change config redis from docker compose to env
2017-08-09 11:28:06 +03:00
Mahmoud ZaltandGitHub 69ccd74d2e Update Improve MAC speed docs 2017-08-08 15:01:41 +03:00
Mahmoud ZaltandGitHub a3c66fdecf Merge pull request #1080 from zuohuadong/patch-6
use openssh-client not  openssh*
2017-08-08 09:03:55 +03:00
Mahmoud ZaltandGitHub 9b8eee6a98 Merge pull request #1079 from zuohuadong/patch-5
add demo and  use  caddy example for laravel
2017-08-08 09:03:18 +03:00
Mahmoud ZaltandGitHub 2082659fb1 update Install Symfony steps in the docs 2017-08-07 05:57:45 +03:00
Mahmoud ZaltandGitHub 1fe2df73e4 Merge pull request #1077 from hounded/master
Missing symfony variables in env-example and workspace. Added python as an option to workspace
2017-08-07 05:51:58 +03:00
Mahmoud ZaltandGitHub 318ca3f81c format the readme.md file 2017-07-29 10:03:50 +03:00
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