c78eb5228a
Merge pull request #803 from activeobjects/master
...
Added support for jenkins official container
2017-04-13 11:48:57 -04:00
81053c0868
Added support for jenkins official container
2017-04-12 15:54:42 +00:00
f91def64d7
Fixing whitespaces and tailing spaces
2017-04-11 21:22:57 +02:00
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
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
ef38dd1532
Fixing ghostscript env option
2017-04-11 16:45:20 +02:00
80a60d58cf
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:22:07 +02:00
15cac480fe
Fixing can't login to PHPMyAdmin
...
fix #754 , login to PHPMyAdmin get "#2005 - Unknown MySQL server host 'mysql' (-2)" error.
2017-04-10 09:50:53 +08:00
0d4bacecd8
bugfix/769 fix linuxbrew, deployer configuration
2017-04-09 11:42:44 -07:00
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
d376074936
fix #759 , php-fpm can't enabled MySQL Support
...
lost passthru parameter
2017-04-07 15:14:15 +08:00
64b985f005
Update docker-compose.yml
2017-04-07 14:27:15 +12:00
cc50339bcb
Update docker-compose.yml
2017-04-07 14:25:40 +12:00
68ff573904
Update docker-compose.yml
...
Added Install_symfony
2017-04-07 10:20:19 +12:00
7230b11d3b
Fixing specified Dockerfile name ( #745 )
2017-04-05 13:45:29 +08:00
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
f99eff3a99
Updating env to switch workspace php version. #714
2017-04-04 23:39:03 +02:00
ff4b913396
Simplifying PHP_FPM version. #724
2017-04-04 23:14:04 +02:00
37dee56bb7
Fixing MariaDB root password variable. #736
2017-04-04 00:05:44 +02:00
b58f859eff
Merge branch 'master' into proxy
2017-03-31 16:42:30 +07:00
a11206d4ba
Change adminer expose port to 8080
...
Most webservers default to 80, but Adminer's docker container runs on 8080.
2017-03-30 18:19:06 -07:00
3d2eb81cd5
Add necessary Adminer config below PMA sections
2017-03-29 22:13:33 -07:00
fc460f9497
Remove duplicate mssql & remove network setup for balancer
2017-03-29 13:59:53 +07:00
1fd55d98e1
Changing map network in docker-compose file
2017-03-26 16:31:18 +07:00
e1036185ae
Fixing from #708 ( #715 )
...
* Fixing workspace_yarn_version
* Remove duplicate type MAINTAINER
* Update README.md
2017-03-26 10:47:03 +08:00
d1af24736b
Merge branch 'master' into proxy
2017-03-25 21:40:37 -04:00
236665d7d3
Change haproxy port to 8085
2017-03-26 08:13:14 +07:00
c340d851d3
Add mssql volumes
2017-03-26 07:30:59 +07:00
bf19ecffcb
Fixing conflict & add mssql
2017-03-26 07:20:24 +07:00
6fa6d02360
Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
...
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
2e86243d88
Update docker-compose.yml
2017-03-24 13:49:38 -03:00
6b61c7d454
adding MSSQL support
2017-03-24 12:31:38 -03:00
894cb6ea27
🐛 fix yarn again after #662 reverted it
...
#706
2017-03-23 11:51:59 +01:00
b81e3e8f15
Fixing workspace_yarn_version
2017-03-23 16:32:11 +07:00
7d49f9b820
Fixing workspace_yarn_version
2017-03-23 16:07:59 +07:00
9dad1586af
Fixing identitation for docker-compose haproxy
2017-03-23 15:01:32 +07:00
5d74e10b08
Update docker compose file for load balancer
2017-03-23 13:53:52 +07:00
d31ccbd268
Conflict resolved docker-compose file
2017-03-18 08:29:14 +07:00
2bbe39cf4a
Merge branch 'master' into master
2017-03-18 07:52:45 +07:00
53f1032975
Merge pull request #673 from cabrerabywaters/PHP_WORKER
...
Php worker
2017-03-17 11:05:53 -04:00
badad156e1
Merge branch 'master' into add_apache_vhost_conf
2017-03-17 16:37:59 +08:00
2219177eac
Merge branch 'master' into master
2017-03-17 14:54:06 +07:00
8de9eca8ae
Fixing the docker-compose.yml
2017-03-17 13:57:54 +07:00
f2805bca52
Update docker-compose.yml
2017-03-16 22:21:26 -03:00
033e1b8721
Merge branch 'master' into PHP_WORKER
2017-03-16 21:59:28 -03:00
9e290ffddb
Merge pull request #680 from cjmaxik/feature-intl
...
Adding intl support to php-fpm container
2017-03-16 20:57:47 -04:00
6ada2f1b91
nginx samples sites for multiple projects
...
- add `project-1.conf` and `project-1.conf` to match the docs.
- keep default to work with both multiple and single projects.
- delete the .gitignore.
- update docker-compose and example-env file to match the new settings
- update the docs
- delete `laravel-https.conf` to replace it with documentation instead
2017-03-16 20:53:14 -04:00
4e443cec09
Merge branch 'master' into feature-intl
2017-03-17 10:08:21 +10:00
528b60eb17
fixing Volumes and Workdir
2017-03-16 21:03:04 -03:00
e0e4616ae0
update installation steps in the docs (.env)
2017-03-16 17:03:05 -04:00
Mahmoud Zalt