 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 |
|
|
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 |
|