Commit Graph

292 Commits

Author SHA1 Message Date
Shao Yu Lung
848398d443 php-fpm service LDAP support 2017-05-12 19:23:03 +08:00
Sascha Brendel
a2058ca6f6 Merge branch 'master' into adding-env-aerospike-rethinkdb-mongodb 2017-05-09 14:07:15 +02:00
Sascha Brendel
546ef0ade6
Added ENV support for aerospike, rethinkdb and mongodb. Part of #763. 2017-05-09 01:31:00 +02:00
Sascha Brendel
4661f1ab0e
Improved caddy support to latest ENV-config. 2017-05-09 00:55:15 +02:00
Shao Yu Lung
533c8fc7f7 mysql create multiple database. 2017-05-08 22:26:10 +08:00
Winfried
07651842b6 Merge pull request #912 from zeroc0d3/master
Add network setup in Jenkins container
2017-05-08 02:36:07 +02:00
ZeroC0D3 Team
3796f9f70a Add network setup in Jenkins container 2017-05-08 06:20:43 +07:00
Winfried
4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Mark Hilton
e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 13:01:03 -04:00
Winfried
ef6071bff0 Fixing typo in the workspace V8 args 2017-04-23 21:16:58 +02:00
Shao Yu Lung
d0effd9468 Fixing Unable to connect to postgresql server 2017-04-21 10:13:53 +12:00
Diego Antunes
5aab3add44 Added blackfire.io 2017-04-21 10:02:54 +12:00
Yu-Lung Shao (Allen)
c67fa5b258 Fixing could not resolve host: elasticsearch (#823) 2017-04-18 12:23:44 +08:00
Diego Antunes
a91bd19739 Merge branch 'master' of https://github.com/laradock/laradock 2017-04-18 10:27:37 +12:00
Diego Antunes
ba32dedbef Added Percona container as an alternative to mysql mariadb 2017-04-18 10:19:09 +12:00
Shao Yu Lung
5f3e0a9109 Fixing Adminer can’t login 2017-04-17 13:40:30 +08:00
wxb
f14b3b32cf add php.ini file 2017-04-16 19:33:27 +08:00
wxb
3a8bd8a015 add data save path(mysql/redis/memcached..) 2017-04-16 19:08:03 +08:00
Mahmoud Zalt
efc23a693d add missing workspace tools to the docs 2017-04-14 21:02:04 -04:00
Mahmoud Zalt
c78eb5228a Merge pull request #803 from activeobjects/master
Added support for jenkins official container
2017-04-13 11:48:57 -04:00
Steve Walker
81053c0868 Added support for jenkins official container 2017-04-12 15:54:42 +00:00
Winfried
f91def64d7 Fixing whitespaces and tailing spaces 2017-04-11 21:22:57 +02:00
Mahmoud Zalt
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 Zalt
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
Winfried
ef38dd1532 Fixing ghostscript env option 2017-04-11 16:45:20 +02:00
Winfried
80a60d58cf Merging removed MySQL ext into MySQLi setting 2017-04-11 13:22:07 +02:00
Yu-Lung Shao (Allen)
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
Mike Erickson
0d4bacecd8 bugfix/769 fix linuxbrew, deployer configuration 2017-04-09 11:42:44 -07:00
Mahmoud Zalt
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
Yu-Lung Shao (Allen)
d376074936 fix #759, php-fpm can't enabled MySQL Support
lost passthru parameter
2017-04-07 15:14:15 +08:00
James Whiteman
64b985f005 Update docker-compose.yml 2017-04-07 14:27:15 +12:00
James Whiteman
cc50339bcb Update docker-compose.yml 2017-04-07 14:25:40 +12:00
James Whiteman
68ff573904 Update docker-compose.yml
Added Install_symfony
2017-04-07 10:20:19 +12:00
Michael Chen
7230b11d3b Fixing specified Dockerfile name (#745) 2017-04-05 13:45:29 +08:00
Mahmoud Zalt
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
Winfried
f99eff3a99 Updating env to switch workspace php version. #714 2017-04-04 23:39:03 +02:00
Winfried
ff4b913396 Simplifying PHP_FPM version. #724 2017-04-04 23:14:04 +02:00
Winfried
37dee56bb7 Fixing MariaDB root password variable. #736 2017-04-04 00:05:44 +02:00
ZeroC0D3 Team
b58f859eff Merge branch 'master' into proxy 2017-03-31 16:42:30 +07:00
Patrick Artounian
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
Patrick Artounian
3d2eb81cd5 Add necessary Adminer config below PMA sections 2017-03-29 22:13:33 -07:00
ZeroC0D3 Team
fc460f9497 Remove duplicate mssql & remove network setup for balancer 2017-03-29 13:59:53 +07:00
ZeroC0D3 Team
1fd55d98e1 Changing map network in docker-compose file 2017-03-26 16:31:18 +07:00
ZeroC0D3 Team
e1036185ae Fixing from #708 (#715)
* Fixing workspace_yarn_version

* Remove duplicate type MAINTAINER

* Update README.md
2017-03-26 10:47:03 +08:00
ZeroC0D3 Team
d1af24736b Merge branch 'master' into proxy 2017-03-25 21:40:37 -04:00
ZeroC0D3 Team
236665d7d3 Change haproxy port to 8085 2017-03-26 08:13:14 +07:00
ZeroC0D3 Team
c340d851d3 Add mssql volumes 2017-03-26 07:30:59 +07:00
ZeroC0D3 Team
bf19ecffcb Fixing conflict & add mssql 2017-03-26 07:20:24 +07:00
Mahmoud Zalt
6fa6d02360 Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
Ignacio Cabrera
2e86243d88 Update docker-compose.yml 2017-03-24 13:49:38 -03:00
Ignacio Cabrera
6b61c7d454 adding MSSQL support 2017-03-24 12:31:38 -03:00
Thor Erik Lie
894cb6ea27 🐛 fix yarn again after #662 reverted it
#706
2017-03-23 11:51:59 +01:00
ZeroC0D3 Team
b81e3e8f15 Fixing workspace_yarn_version 2017-03-23 16:32:11 +07:00
ZeroC0D3 Team
7d49f9b820 Fixing workspace_yarn_version 2017-03-23 16:07:59 +07:00
ZeroC0D3 Team
9dad1586af Fixing identitation for docker-compose haproxy 2017-03-23 15:01:32 +07:00
ZeroC0D3 Team
5d74e10b08 Update docker compose file for load balancer 2017-03-23 13:53:52 +07:00
ZeroC0D3 Team
d31ccbd268 Conflict resolved docker-compose file 2017-03-18 08:29:14 +07:00
ZeroC0D3 Team
2bbe39cf4a Merge branch 'master' into master 2017-03-18 07:52:45 +07:00
Mahmoud Zalt
53f1032975 Merge pull request #673 from cabrerabywaters/PHP_WORKER
Php worker
2017-03-17 11:05:53 -04:00
g9308370
badad156e1 Merge branch 'master' into add_apache_vhost_conf 2017-03-17 16:37:59 +08:00
ZeroC0D3 Team
2219177eac Merge branch 'master' into master 2017-03-17 14:54:06 +07:00
ZeroC0D3 Team
8de9eca8ae Fixing the docker-compose.yml 2017-03-17 13:57:54 +07:00
Ignacio Cabrera
f2805bca52 Update docker-compose.yml 2017-03-16 22:21:26 -03:00
Ignacio Cabrera
033e1b8721 Merge branch 'master' into PHP_WORKER 2017-03-16 21:59:28 -03:00
Mahmoud Zalt
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 Zalt
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
Max Mekenya
4e443cec09 Merge branch 'master' into feature-intl 2017-03-17 10:08:21 +10:00
Ignacio Cabrera
528b60eb17 fixing Volumes and Workdir 2017-03-16 21:03:04 -03:00
Mahmoud Zalt
e0e4616ae0 update installation steps in the docs (.env) 2017-03-16 17:03:05 -04:00
Mahmoud Zalt
c00fe5d7e0 Merge branch 'multiple-projects-improvement'
* multiple-projects-improvement:
  updated env-example and removed .env.example
  complete missings
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
2017-03-16 16:10:28 -04:00
Mahmoud Zalt
dcec8a46a8 replace the links with depends_on in the docker-compose file
closes #636
2017-03-16 15:11:04 -04:00
Mahmoud Zalt
1d6583e97e Revert "Add apache conf file for specific virtualhost ServerName" 2017-03-16 14:40:45 -04:00
Mahmoud Zalt
1cf5bcde62 Merge pull request #682 from MauricioTRS/master
Elasticsearch - Fix plugins directory
2017-03-16 13:35:24 -04:00
Mahmoud Zalt
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 Zalt
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 Zalt
73a3745cc3 Merge pull request #370 from philtrep/certbot
Certbot container
2017-03-16 13:25:15 -04:00
MauricioTRS
bed0fd9bdb Elasticsearch - Fix plugins directory 2017-03-16 14:24:56 -03:00
Mahmoud Zalt
3f1d4b70a6 Merge pull request #650 from wayanjimmy/feature/mailhog
Add mailhog for mail debugging
2017-03-16 13:23:28 -04:00
Max Mekenya
c62ce7d36f Update docker-compose.yml 2017-03-16 09:59:52 +10:00
Ignacio Cabrera
cbd3cf7c20 Adding php-worker container to docker-compose 2017-03-14 11:06:45 -03:00
Ignacio Cabrera
fd0cbff16c Adding ARG to docker-compose 2017-03-14 10:58:35 -03:00
Mahmoud Zalt
ab1d5bae95 complete missings 2017-03-13 21:03:31 -04:00
ZeroC0D3 Team
c88e690bb4 Merge branch 'master' into master 2017-03-10 08:09:07 +07:00
ZeroC0D3 Team
c1de398acc Change default phpmyadmin environment for mysql 2017-03-10 07:53:33 +07:00
ZeroC0D3 Team
73f7c88122 Fixing environment in docker-compose file 2017-03-09 19:21:36 +07:00
Marius van Zundert
36fcc6674e Seperated mysqli and tokenizer as seperate options without putting them under code igniter 2017-03-09 09:29:07 +01:00
hchs
37ed904f1a add vhost example 2017-03-09 10:26:47 +08:00
Marius van Zundert
7a343f168f Updated with laradock master 2017-03-08 16:08:42 +01:00
alchimik
178d7e1505 fix selenium (#655)
see https://github.com/SeleniumHQ/docker-selenium#running-the-images
2017-03-07 23:57:18 -05:00
Marius van Zundert
1d918a71d8 fixed example and docker-compose.yml 2017-03-06 22:20:31 +01:00
Marius van Zundert
603010cbd5 Split up mysqli and tokenizer 2017-03-06 09:03:12 +01:00
Thor Erik Lie
a7503ce3f3 Add Minio container
Minio is an s3 compatible server written in go.
2017-03-05 15:06:22 +01:00
Wayan Jimmy
48710f19c3 Sync with master 2017-03-04 02:10:34 +08:00
Wayan Jimmy
0983cc98fe Setup mailhog 2017-03-04 02:07:29 +08:00
Riccardo Tribbia
6be81f05c2 - Aggiunto servizio php-worker per avviamento queue 2017-03-02 12:14:38 +01:00
Riccardo Tribbia
8317fbde5c - Eliminato .env dal repo git per poterlo linkare nel progetto locale
- Impostata configurazione dinamica porte per apache
2017-03-01 15:55:33 +01:00
Marius van Zundert
b45f395996 Removed homestead entirely this time 2017-03-01 08:29:17 +01:00
Marius van Zundert
59dfacee13 Removed homestead entirely this time 2017-03-01 08:17:34 +01:00
Marius van Zundert
a6e0338245 Removed Homestead reference in all DB containers 2017-03-01 08:08:20 +01:00
Marius van Zundert
f610aa63d1 Removed reference to homestead 2017-02-27 15:58:38 +01:00