blackbirdchess/blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,981 Commits 1 Branch 0 Tags 15 MiB
c09261e99e
Commit Graph

433 Commits

Author SHA1 Message Date
bestlong
0f4a417f4e fix aerospike build failed 
php-fpm and workspace
 2018-06-01 01:30:35 +08:00
Shao Yu-Lung (Allen)
185ba60a09
Merge branch 'master' into master 2018-05-28 10:46:18 +08:00
Luciano Jr
69de0668e9 Add portainer 2018-05-27 10:39:41 +01:00
bestlong
62b716f469 fix Getting Started step "docker-compose up -d nginx mysql" missing workspace container. 2018-05-27 11:21:22 +08:00
Grzegorz Dąbrowski
b990af3353 Add subversion support in workspace 2018-05-07 10:58:55 +02:00
Wouter van Dongen
3ad17eca0a - Fix Drush installation 
- Consistent naming of arguments
- Add deprecated install note
 2018-04-23 20:30:47 +02:00
Mahmoud Zalt
0c41fceae1 add missing DRUSH_VERSION to workspace arguments 2018-04-06 18:06:44 +03:00
Mahmoud Zalt
101986c76f merge the php versions dockerfiles in php-fpm, workspace and php-worker 2018-04-06 10:04:56 +03:00
Mahmoud Zalt
a0c5ef75d2 upgrade docker-compose to v3 2018-04-05 16:43:22 +03:00
Mahmoud Zalt
0586247e3f
Merge branch 'master' into debug-workspace-scheduler 2018-04-04 17:48:46 +03:00
Dearmadman
54e6d66c83 [feature] support for php worker hot load 2018-03-30 14:30:49 +08:00
Yu-Lung Shao (Allen)
1e5d787a7e
Merge pull request #1457 from bestlong/fix-elasticsearch 
fix #1418 elasticsearch up fails.
 2018-03-29 16:18:07 +08:00
Shao Yu Lung
83140d9939 fix #1418 elasticsearch up fails. 2018-03-29 15:34:38 +08:00
Mahmoud Zalt
871a9d032a
Merge pull request #1438 from pangminfu/apache-docroot-path 
Apache document root path configurable with env file
 2018-03-25 19:15:16 +03:00
Andrew Baranov
245515b41d Use xDebug with Laravel scheduler inside workspace container. 2018-03-22 12:38:42 +03:00
mfpang
f5f23bed1b apache2 accept APACHE_DOCUMENT_ROOT argument from .env file 2018-03-18 17:37:21 +08:00
Spyros Sakellaropoulos
23b8239cfa
Save PostgresSQL data to hard drive. 
PostgresSQL data don't get saved to hard drive. This tweak should fix that
 2018-03-09 10:47:43 +02:00
Vijay Rangan
8fc33f5bb9
Reference beanstalkd-console host port 
This pull request references the of `BEANSTALKD_CONSOLE_HOST_PORT` from the `.env` file in the `docker-compose.yml`. Prior to this PR, the environment variable was defined in the `.env` file but was not used.
 2018-03-01 22:00:15 +05:30
Yu-Lung Shao (Allen)
04105b912d
Merge pull request #1375 from wvdongen/master 
Added support for Apache Solr
 2018-02-27 17:19:20 +08:00
Yu-Lung Shao (Allen)
8d0bd8505c
Merge pull request #1354 from taufek/tj-install-prestissimo 
Install Prestissimo in Workspace
 2018-02-27 00:00:25 +08:00
Yu-Lung Shao (Allen)
43ba898df3
Merge branch 'master' into php-fpm-install-imap 2018-02-26 20:33:35 +08:00
Bolo Lai
4b5a1ef628 support custom composer repo url and npm registry url 2018-02-21 13:13:19 +08:00
Sven Slijkoord
61d3874736
Update docker-compose.yml 2018-02-13 19:19:07 +01:00
Wouter van Dongen
b7f89e6b00 Add Solr 2018-02-11 11:36:57 +01:00
Taufek Johar
0b902e3e96 Install Prestissimo in Workspace 
**Why we need this change?**

[Prestissimo](https://github.com/hirak/prestissimo) will enabled `composer` to install plugins in parallel.

**Source**

http://jackmcdade.com/blog/tired-of-waiting
 2018-01-17 10:21:08 +08:00
Mahmoud Zalt
0077de28a1
Merge pull request #1345 from jdxia/master 
workspace container adds swoole
 2018-01-09 19:23:10 +01:00
Mahmoud Zalt
d098f1f6ad
Merge pull request #1322 from jk2K/master 
feat: add GMP extension to PHP-fpm
 2018-01-09 19:22:19 +01:00
Mahmoud Zalt
0b7cb81f47
Merge pull request #1333 from Zamerick/master 
updates path for postgres
 2018-01-09 19:18:01 +01:00
Mahmoud Zalt
368c85dc61
Merge pull request #1326 from ed-fruty/add_amqp_supports 
Added support for AMQP extension in workspace and php-fpm containers.
 2018-01-09 19:16:30 +01:00
x
c44338e370 workspace container adds swoole 2018-01-09 11:25:57 +08:00
Alex Oxthorn
7bd22f015e updates path for postgres 2017-12-30 16:14:02 -05:00
Miguel Ángel Sánchez Palafox
00f8c3407e add memory to process up elastiseach 2017-12-28 10:54:45 -06:00
Fruty
0aaa2c742e Added support for AMQP extension in workspace and php-fpm containers. 2017-12-28 14:25:32 +02:00
yemeng1
0445d76d11 feat: add GMP extension to PHP-fpm 2017-12-27 18:56:26 +08:00
Mahmoud Zalt
6e6a658a79 fix broken test 2017-12-20 18:07:37 +01:00
Mahmoud Zalt
b9e982c112 rename balancer to haproxy 2017-12-20 01:09:19 +01:00
KoRiGaN
63c69231f7 Give minio access to backend 
Add volume to persist minio configuration
Modify minio data volume to use the standard DATA_SAVE_PATH
 2017-12-13 17:45:15 +01:00
Jeff
cf5b1af31a Fixes #353 and allows easier dev & prod environments by splitting dev-specific configuration into a separate docker-compose. 2017-11-21 09:59:11 +13:00
huadong zuo
bd0f04bd80
fix pgadmin-backup 
new version has new contents
 2017-11-13 18:33:28 +08:00
Jeroen van Oort
23ee4f6679 added IMAP extension to workspace 2017-11-06 11:12:02 +01:00
Nick Hope
894b0197e0 Fixed: PHP-Worker has missing PGSQL drivers. 2017-10-29 12:54:05 +00:00
Thorvald Falkenburg
f4ede08b9c Fix variable issues. 
Also made the variables introduced with the psql client consistent
with the existing ones. Fixes #1208
 2017-10-25 11:40:47 +02:00
Lan Dong Si Hoang (Geraint Dong)
60998ed1e4 Merge branch 'master' into Add_pg_client_to_workspace_phpfpm 2017-10-24 13:03:56 +07:00
Arkadius Jonczek
49e48edefd Merge remote-tracking branch 'upstream/master' 2017-10-18 14:41:20 +02:00
Arkadius Jonczek
182386b514 removed grafana-storage 2017-10-18 14:38:10 +02:00
Arkadius Jonczek
bea122a1fd removed depends_on from grafana and added Grafana port to env-example 2017-10-18 14:34:27 +02:00
Geraint Dong
ee03bb607f Add support for pgclient to workspace & php-fpm 2017-10-18 10:04:23 +07:00
Maxime Helias
8e556008d8 Add MailDev Container 2017-10-14 20:01:16 +02:00
Taufek Johar
eeee14338f Move Chrome Driver Version to Env 
This will allow us to upgrade chrome driver easily. Set the default chrome driver to 2.32.

Also remove the comment and empty line to avoid getting below warning:

```
[WARNING]: Empty continuation lines will become errors in a future release.
```
 2017-10-06 22:58:52 +08:00
Taufek Johar
881cbfb8c2 Install Dependencies to Run Dusk Tests 
**Why we need this change?**

Currently we are unable to run Dusk (Browser) tests in workspace container. This change,
is to allow us to install all dependencies needed to run Dust test which consists of

1. Linux packages such as xvfb (x-virtual frame buffer to run browser in headless container) and etc.
2. Chrome browser.
3. Chrome driver.

To install the Dusk dependencies.
1. Update `WORKSPACE_INSTALL_DUSK_DEPS` to true.
2. Run `docker-compose build workspace`.

I've also added couple of aliases to facilitate the preparation of test environment.

1. xvfb = `Xvfb -ac :0 -screen 0 1024x768x16 &` (run x-virtual frame buffer in the background)
2. serve = `php artisan serve --quiet &` (run laravel app in the background)

Once those are installed, we will need to update the default chrome driver argument in Laravel 5.5
from `--headless` to `sandbox`. Below are the steps to run Dusk in workspace.

1. `docker-compose run workspace bash` (get into workspace).
2. `laravel new dusk-test` (generate new lavarel app for testing purpose).
3. `cd dusk-test` (change directory to newly generate app folder).
4. `composer install --dev laravel/dusk` (install dusk via composer).
5. `php artisan dusk:install` (generate dusk files).
6. `sed -i '/APP_URL/d' .env` (remove APP_URL entry in .env)
7. `echo 'APP_URL=localhost:8000' >> .env` (add new APP_URL entry in .env)
8. `sed -i--'s/headless/no-sandbox/g' tests/DuskTestCase.php` (replace the default chrome driver argument).
9. `xvfb` (alias to run Xvfb instance in the background).
10. `serve` (alias to run laravel app in the background).
11. `dusk` (alias to run Dusk test).
 2017-10-02 20:08:01 +08:00
Arkadius Jonczek
508e9ebd9e added grafana docker container 2017-10-01 02:36:55 +02:00
Kévin Mathieu
04770bc4ec Add PHP LDAP extension if needed 2017-09-29 14:56:28 +02:00
Geraint Dong
8f7b1b7e9f Add Postgre SQL Support for php-fpm & edit webserver session storage location 
+ Fix bug
 2017-09-25 18:31:16 +07:00
Taufek Johar
8cb4c8d62e Add Terraform to Workspace 
Added Terraform (www.terraform.io) binary to workspace container.
This tool is useful to spawn resources to multiple cloud providers via config files.
 2017-09-23 15:49:55 +08:00
Roel Arents
110aa91c59 add APACHE_PHP_UPSTREAM_TIMEOUT 2017-09-18 15:24:48 +02:00
Joel Simpson
a5f3a92eb4 Update docker-compose.yml 
It looks like the 
     219: user: "1000:50" 
statement was added a while back to fix a file permissions issue, but on a completely fresh up it keeps mysql from starting, generating the following.  Removing the line allowed everything to work properly.:

mysql_1                | Initializing database
mysql_1                | mysqld: Can't create/write to file '/var/lib/mysql/is_writable' (Errcode: 13 - Permission denied)
mysql_1                | 2017-09-14T23:55:30.989254Z 0 [Note] Basedir set to /usr/
mysql_1                | 2017-09-14T23:55:30.989559Z 0 [Warning] The syntax '--symbolic-links/-s' is deprecated and will be removed in a future release
mysql_1                | 2017-09-14T23:55:30.989602Z 0 [Warning] 'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
mysql_1                | 2017-09-14T23:55:30.990877Z 0 [ERROR] --initialize specified but the data directory exists and is not writable. Aborting.
mysql_1                | 2017-09-14T23:55:30.990886Z 0 [ERROR] Aborting
 2017-09-14 17:17:34 -07:00
Melchor O. Abcede Jr
792789e479 added eb cli container 2017-09-12 04:13:44 +08:00
Arhey
b2e372054f Fixed php-fpm build 2017-09-05 23:36:30 +03:00
Arhey
b61ff4f484 Added support of ImageMagick 2017-09-05 02:36:24 +03:00
Eugene Kirdzei
53b3ad0f7e Fix Php Redis extension installation 2017-08-31 19:29:19 +03:00
Mahmoud Zalt
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 Zalt
b2f7348552 Merge pull request #1101 from terryzwt/drpual-console 
add drupal console to workspace
 2017-08-23 21:14:13 +03:00
Osama
2af5b2ff49 fix mysql can't write to file 2017-08-22 12:12:56 +03:00
terry
93d5b318fe add drupal console to workspace 2017-08-19 22:58:40 +08:00
Patrick Mac Gregor
9ce470e14e [php-worker] dedicated dockerfile for php 7.0/7.1 
fixes #927: PHP-Worker container uses PHP-CLI 7.0.9 despite workspace using 7.1.4
 2017-08-17 09:39:37 +02:00
zuohuadong
76001daf71 add pgadmin backup volumes 
you can use backup files  in ${DATA_SAVE_PATH}/pgadmin-backup
 2017-08-14 10:09:17 +08:00
Ary Widiantara
e4f4de47e7 [UPDATE] change config redis from docker compose to env 2017-08-09 10:17:53 +07:00
James Whiteman
05c7f9186a Update docker-compose.yml 
Added missing symfony and python options to workspace
 2017-08-07 08:47:53 +12:00
Mahmoud Zalt
5c0b8316b1 make the PHP_UPSTREAM config for NGINX and Apache identical 2017-08-04 00:50:20 +03:00
Mahmoud Zalt
63816ab7d6 Merge branch 'change-mysql-version' of https://github.com/hackel/laradock into hackel-change-mysql-version 
* 'change-mysql-version' of https://github.com/hackel/laradock:
  Add documentation on the MYSQL_VERSION variable.
  Allow specifying the version of MySQL to install in .env file.
 2017-07-25 23:30:46 +03:00
Ujjwal Ojha
9dda2f6b9f image optimizers libraries 2017-07-10 18:49:39 +05:45
Ryan Hayle
7ec8b8846e Allow specifying the version of MySQL to install in .env file. 2017-07-07 16:43:06 -05:00
Vincent Chu
02e2454c79 add docker-entrypoint-initdb.d variables for MySQL + MariaDB + Percona 2017-07-06 00:39:16 -04:00
Mahmoud Zalt
bf60f7520b Merge pull request #1038 from vwchu/master 
add APACHE_SITES_PATH variable
 2017-07-04 07:25:40 +03:00
Mahmoud Zalt
916e9f38f3 Merge pull request #1022 from ItaloBC/patch-3 
ElasticSearch instance fails at loading (missing parameters)
 2017-07-04 07:25:20 +03:00
Vincent Chu
bc1c957f47 add APACHE_SITES_PATH variable 2017-06-30 06:22:55 -04:00
Patrick Mac Gregor
1951834150 [Fix] Mailhog should be exposed to backend 
- fixes failing connection to host "mailhog" when sending mail via smtp
- mailhog needs to be available for the backend at Port 1025
- i.e. in a Laravel app .env should contain "MAIL_HOST=mailhog
 2017-06-28 11:28:04 +02:00
ItaloBC
bbbd247653 ElasticSearch instance fails at loading (wrong) 
ElasticSearch (ES from now onwards) will fail to initialize since the parameters for its environment are not correct or absent. These are:

* `cluster.name`: Name of the cluster itself
* `bootstrap.memory_lock`: Needed for ES to [lock the JVM into swap instead of memory](https://www.elastic.co/guide/en/elasticsearch/reference/master/_memory_lock_check.html).
* `"ES_JAVA_OPTS=-Xms256m -Xmx256m"`: [Initial and maximum HEAP size for JVM](https://www.elastic.co/guide/en/elasticsearch/reference/current/_heap_size_check.html). Since it's locked to disk, should be the same. Half the defaults (512m) for development.
* `ulimits: memlock: soft (-1), hard (-1)`: [ES needs to have unlimited access to memory](https://www.elastic.co/guide/en/elasticsearch/reference/current/max-size-virtual-memory-check.html), otherwise it will feel sluggish.  
* `mem_limit: 512m`: Hard limit the memory available for the container.

This can, and should, be changed using `.env` file variables, but it seems that this should suffice for basic ES development.
 2017-06-14 14:19:47 -04:00
Michal Ardziejewski
e56587ec47 Added TZ environment for MySQL Container 2017-06-13 01:03:42 +02:00
Mark Davidson
0561199914 Add Kibana Container (#993) 
* Add Kibana Container

* Add Kibana Port to env-example
 2017-06-02 23:54:37 -05:00
Mahmoud Zalt
4a663649c0 Merge pull request #983 from cre8/master 
Add laravel echo server
 2017-05-30 17:50:08 +03:00
Lawrence Eldridge
d0c0a8895e add global instance of larval installer for fresh projects. (#988) 2017-05-30 09:05:30 -05:00
Mirko
da60b32a04 add laravel echo server 2017-05-27 15:24:50 +02:00
Shao Yu Lung
f3a016aa79 adminer support mssql 2017-05-25 16:44:51 +08:00
wxb
01f6d8f038 edit docker-compose.yml, add swoole config 2017-05-15 02:07:45 +08:00
Shao Yu Lung
6ff7f4a402 percona service use DATA_SAVE_PATH env var, same way mysql, mariadb. 2017-05-13 22:04:35 +08:00
Shao Yu Lung
20fddc6de7 fix percona service create multiple db solution user can’t see other db problem. 2017-05-13 21:37:25 +08:00
Winfried
1eaac78fdd Merge pull request #936 from bestlong/fix-mariadb-create-multiple-db-user-cant-see 
Fixing MariaDB service create multiple db solution
 2017-05-13 13:45:40 +02:00
Shao Yu Lung
855241d966 fix mariadb service create multiple db solution user can’t see other db problem. 2017-05-13 11:00:36 +08:00
Mahmoud Zalt
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
Alex
41574fe026 Fix #934. Add extra_hosts to php-worker container 2017-05-12 17:17:38 +03:00
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