Commit Graph

191 Commits

Author SHA1 Message Date
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
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 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
Marius van Zundert 966a84fa39 Fixed timezone issue in docker-compose.yml 2017-02-27 14:49:43 +01:00