Commit Graph

661 Commits

Author SHA1 Message Date
ganlei 00df369e96 Add IonCube Loader (zend_extension) (#1763) 2018-09-08 21:31:05 +08:00
vladyslavstartsev 39469e1404 added ssh2 to workspace and php-fpm (#1756) 2018-08-28 14:16:25 +08:00
ahkui 947a791ad2 Auto reload caddy and add basicauth example (#1706)
* add live reload and basicauth
2018-08-26 16:02:55 +08:00
vladyslavstartsev aa84dd8616 added ext-gmp to workspace container (#1762) 2018-08-21 19:01:12 +08:00
ahkui b788a8bbfd Add Web Based IDEs (#1705)
Add Web Based IDEs: Theia, WebIDE, Codaid, IceCoder.
2018-08-21 13:49:56 +08:00
Youri Westerman 89051de67d This developer needed to turn back the clock in the PHP-FPM container, you will not believe what he did next! (#1675)
* Added documentation for installing libfaketime in the php-fpm container
* Enabled installing and using libfaketime system-wide inside the php-fpm container
2018-08-21 13:41:34 +08:00
Nazariy Hazdun d178613e66 code style fix 2018-08-17 14:33:24 +03:00
Nazariy Hazdun 006946ce6a Add Weaver-athenapdf 2018-08-17 14:31:38 +03:00
Ígor Jacaúna 8180804ae0 Add Metabase for analytics and Business Intelligence (#1711)
* Include metabase service
* Removing unecessary environment variables
* Update documentation
2018-07-29 13:07:15 +08:00
Shao Yu-Lung (Allen) 764e484599
Env variable conflict (#1734)
* php-fpm and workspace arg var rename: PHP_VERSION to  LARADOCK_PHP_VERSION.
* travis-ci skip phpbdg
2018-07-29 12:00:13 +08:00
vladyslavstartsev fbc2afee71 implemented option to add bcmath to laradock php-worker (#1716)
* implemented option to add bcmath to laradock php-worker
* updated docs
2018-07-20 15:44:07 +08:00
Madson Jr 7aba9991f6 Conflict merge 2018-07-18 13:26:27 -03:00
Madson Jr 238a78aafc Merge branch 'master' into graphviz 2018-07-18 13:25:39 -03:00
Madson Jr e07ee7d07d GraphViz support in workspace
Issue #1003
2018-07-18 13:25:16 -03:00
ahkui d8b2b8c233 Add gitlab (#1683)
* Add gitlab
2018-07-18 21:20:43 +08:00
Shao Yu-Lung (Allen) 7ef36daaba
Fix run mongo-webui service get exit 1 (#1702) 2018-07-13 22:32:40 +08:00
Youri Westerman 4ce25e95b4 Added option to install the php calendar extension in php-fpm (#1672)
* Added option to install the php calendar extension in php-fpm
* Added section about installing php calendar extension in php-fpm
2018-07-13 18:31:13 +08:00
ahkui dc234b9b28 Add Jupyterhub (#1686) 2018-07-13 11:35:46 +08:00
ahkui 29483bab8c Add Ipython (#1685) 2018-07-13 11:33:41 +08:00
ahkui 2f996450e5 Add Redis webui (#1688)
* add redis webui
* Update env-example
* depends on redis
2018-07-06 20:57:29 +08:00
ahkui 1823060c4b Add Mongo webui (#1687)
* add mongo webui
* update
* Update env-example
2018-07-06 20:54:44 +08:00
Eugene Kirdzei a1e01ac19b Install phpdbg (#1612)
* Install phpdbg
* Change documentstion
2018-06-30 16:54:46 +08:00
vlauciani 9cb7624da7 bugfix: add 'networks' to 'docker-in-docker' (#1660)
I do not know why but the pull request https://github.com/laradock/laradock/pull/1655 has lost the 'networks' code. I'll try to insert it Insert again ;-)
2018-06-30 16:49:29 +08:00
vlauciani 9d42ea6b9d Update docker-compose.yml to add 'dind' (#1655)
Add 'dind' image to run docker-in-docker: issue https://github.com/laradock/laradock/issues/1653
2018-06-28 13:25:33 +08:00
ahkui b0bfa5f1d3 Add netdata for monitoring server (#1613)
* add netdata container
* update document
* update document each part separate with 6 * \n
* remove unuse file
2018-06-28 13:24:08 +08:00
Emanuele Menon dcf6b6d9ac Install of libpng16 library for fix react and react with material-ui application (#1625)
* Added commands in Workspace Dockerfile for installation of libpng with configurable env argument switch

* Updated documentation
2018-06-28 13:14:06 +08:00
Abdelrahman Omran 7d1dc66f77 Conditionally install npm tools (#1641) 2018-06-24 23:19:09 +08:00
KUI\ahkui 4b2c440146 add init database 2018-06-15 04:39:19 +08:00
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
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
Marius van Zundert 356dc36fd5 Added NGINX from env file and updated env-example 2017-02-27 14:11:16 +01:00
Marius van Zundert c112fdffc1 Updated PHP-FPM container to accept .env variables 2017-02-27 14:05:47 +01:00
Marius van Zundert fa9ac1e471 Added workspace from env file and updated env-example 2017-02-27 13:53:40 +01:00
Marius van Zundert 474504f1d3 Added env-example and adjusted docker-compose yml to support new env file 2017-02-27 12:35:28 +01:00
Francis Lavoie 770a9779ca Fix Caddy volumes to persist SSL (#613)
I'm blaming commit 380eef5fd9 for breaking this functionality.
2017-02-21 23:26:56 +08:00
Austin Benesh cf34c4ed32 Fixed SOAP for both php-fpm and CLI 2017-02-07 15:21:30 -07:00
Talip Durmuş c5e2e7e1e2 Add deployer support (#579)
* add deployer option

* export path for all composer global installations

* add deployer option

* fix typo

* add readme for deployer installation

* deployer default option changed to false

* Add missing deployer menu
2017-01-31 17:05:42 +08:00
Talip Durmuş 5d2761bc92 Add missing PhpRedis option (#570) 2017-01-26 22:19:13 +08:00
choirudin a94f08920a add php exif (#564)
* add php exif

* format
2017-01-22 12:20:27 +08:00
Mike Erickson a80ef301a9 541-add-linuxbrew-option (#543)
* 541-add-linuxbrew-option

* 541 updated readme with installation information
2017-01-13 14:12:44 -05:00
hexu 14f6dffe99 Fix bug on mariadb
Bug on Docker for Mac when we change the database from mysql to mariadb.

Maybe It is not a perfect fix. This fix will not share the same mysql volume, means we could not change database directly. We have to import the database to both database. But it will fix the Bug . Wish for better solution
2017-01-12 18:47:11 +08:00
Edmund Luong 2fc3919598 Added service container for Selenium standalone with Chrome (#519)
* Added service container for Selenium standalone with Chrome
2017-01-01 10:22:01 -05:00
Cristian Mello 1ce802f2cc Update docker-compose.yml 2016-12-26 12:38:50 -02:00
Cristian Mello 33e8e91e49 Add Laravel Envoy (#510)
Add laravel envoy
2016-12-25 12:38:25 -05:00
Mahmoud Zalt 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 Zalt 860af556e2 Support bcmath php extention on php-fpm and workspace (base image 1.3)
Probably closes #453
2016-12-21 14:01:51 -05:00
Juan Eugenio Abadie d76f9e7722 Typo
elasticsearch-pkugins ->  elasticsearch-plugins
2016-12-21 10:16:32 -03:00
Bo-Yi Wu e9d3a838f1 Merge pull request #491 from laradock/bug
fix #490 duplication of key "volumes"
2016-12-16 17:23:01 +08:00
Bo-Yi Wu 380eef5fd9 fix #490 duplication of key "volumes"
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 17:21:45 +08:00
Bo-Yi Wu b8142222e5 Support specific version of yarn.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 09:36:08 +08:00
Austin Benesh da6b950623 Added SOAP option to php-fpm install. 2016-12-15 12:13:27 -07:00
Vladimir Kireyko aabe504c24 Add dokerfile with php 7.1 2016-12-15 15:13:00 +02:00
Edmund Luong 8bacb129c6 Add option to install Google V8 Javascript Engine PHP extension 2016-12-13 20:00:48 -05:00
Philippe Trépanier a3288462a8 Merge pull request #434 from dlnsk/Fixes
Fixes for nginx and mysql
2016-11-25 01:51:25 -05:00
philtrep 4ef5db3713 Added proper creation of mysql user, removal of default homestead user 2016-11-17 16:37:51 -05:00
Dmitry Pupinin d703c82c46 Exclude sites configuration from image and just use volume 2016-11-16 15:58:42 +07:00
philtrep d89a944e22 Added nginx config for certbot 2016-11-14 11:29:44 -05:00
philtrep 4030cc2f26 Added certbot container 2016-11-14 11:27:37 -05:00
Bo-Yi Wu 7e2814168a fixed #420 remove phpmyadmin volume setting. 2016-11-14 23:45:52 +08:00
Bo-Yi Wu 5d98e78dba Revert #418 and fix install yarn package management.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-10 10:23:49 +08:00
Mahmoud Zalt 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
Alexandre Thomas 5594c53e03 Fix bug in PATH 2016-11-09 17:55:35 +01:00
Alexandre Thomas 44045f85e6 Fix a bug that prevents yarn from installing 2016-11-09 16:14:49 +01:00
João Joyce a42f62c626 Postgis 2016-11-08 13:17:23 +00:00
darthrevan13 3d54d68aa1 Fix for mariadb local path
When running docker-compose with mariadb the following message will appear:

ERROR: for mariadb  Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute.
ERROR: Encountered errors while bringing up the project.

This commit fixes the issue.
2016-11-03 15:45:59 +02:00
Mahmoud Zalt 146f8ea6f4 rename volumes_source to applications 2016-11-01 10:05:10 -04:00
Mahmoud Zalt 9ab6d8fa15 remove volumes container 2016-11-01 10:03:47 -04:00
Mahmoud Zalt f630970151 remove `./databases:/docker-entrypoint-initdb.d` until it works 2016-10-31 20:46:02 -04:00
Mahmoud Zalt 739cc31f4c change app mapping directory from www/laravel to www
also add sample to show facilitate setup for multiple sites
2016-10-31 19:49:48 -04:00
Mahmoud Zalt 6ee790c26d Add support for Codeigniter 2016-10-31 12:21:01 -04:00
Mahmoud Zalt a1ade52cd6 Merge pull request #369 from LaraDock/patch
fixed #363 PHP_IDE_CONFIG variable.
2016-10-31 08:08:48 -04:00
Bo-Yi Wu a0981aa836 Add install elasticsearch plugin section.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-26 09:40:53 +08:00
Dilone 6eed8199df update port to 2222 - no conflict linux 2016-10-24 03:58:03 -04:00
calebfavor 891911ddc3 Removing double quotes for apache php fpm configuration. 2016-10-17 14:17:23 -07:00
Bo-Yi Wu 89a21ccf1b fixed #363 PHP_IDE_CONFIG variable.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-15 08:50:17 +08:00
Bo-Yi Wu 62e0f0443c Support Yarn MANAGEMENT tool.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-13 12:06:30 +08:00
philtrep fb26035e5c Added timezone arguments to workspace build 2016-10-10 09:44:25 -04:00
Mahmoud Zalt 781f5ff972 add missing info to the readme 2016-10-10 07:32:01 -04:00
Mahmoud Zalt 7ecb712e76 Revert ports fowarding for MySQL and MariaDB
Include production docker compose file
2016-10-09 16:51:18 -04:00
philtrep ec3ebb9701 Remove port fowarding for MySQL and MariaDB 2016-10-03 13:25:34 -04:00
Francis Lavoie 16b6223ba9 Fixes #305 2016-09-13 21:40:03 -04:00
Bo-Yi Wu b254d4a9c9 add mysql custom configuration file.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-11 08:39:25 +08:00
Lialosiu da6face95e add build options MAX_ALLOWED_PACKET to mysql 2016-09-09 10:21:33 +08:00
Bo-Yi Wu 8c392e94f2 Support ElasticSearch Container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-07 15:18:54 +08:00
Mahmoud Zalt a9ecdd0008 Merge pull request #284 from appleboy/patch-1
Update postgres share volume path
2016-09-04 05:26:40 -04:00
Mahmoud Zalt 1dab0c48d8 Merge pull request #283 from appleboy/patch-10
Add pgAdmin container
2016-09-04 05:26:10 -04:00
Bo-Yi Wu 4013553dbb Update postgres share volume path 2016-09-04 09:04:18 +08:00
Bo-Yi Wu 7999399e9a Add pgAdmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-03 21:24:36 +08:00
larryeitel d684cb4742 remove port 22 from php-fpm because of conflict 2016-09-02 10:38:15 -06:00
Luciano Gonçalves a3039958e3 Fix conflicts 2016-09-01 13:23:40 +01:00
Luciano Gonçalves b01bae59fc Fix volumes aerospike section 2016-09-01 13:21:21 +01:00
Luciano Gonçalves 92dc3be3b1 Remove duplicate argument on aerospike section 2016-09-01 13:05:53 +01:00
larryeitel 07d6ec85ca Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-30 08:40:28 -06:00
Mahmoud Zalt adfb559521 Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk
expose-port-22-and-add-insecure_id_rsa_ppk
2016-08-30 17:29:51 +03:00
Mahmoud Zalt 05e0e9c817 Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
2016-08-30 11:06:16 +03:00
Mahmoud Zalt 6dcb174012 Merge pull request #266 from bktz/master
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
Mahmoud Zalt de914d106f Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size
use docker image which only supplies true & echo binaries.
2016-08-30 11:01:33 +03:00
Benjamin Katznelson 1e5d604470 Added support for RabbitMQ 2016-08-28 18:12:55 +10:00
larryeitel d441427852 Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:22:36 -06:00
larryeitel 227c8da17c Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:00:01 -06:00
Eric Pfeiffer 6ba76da709 use docker image which only supplies true & echo binaries. 2016-08-27 13:18:13 -05:00
Bo-Yi Wu 78be0b577e support specific node version
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 19:38:44 +08:00
Eric Pfeiffer 29d714a849 caddy log to file. enable gzip compression. 2016-08-26 13:26:22 -05:00
Mahmoud Zalt 9fb50b2c6b fix phpmyadmin port. closes #247 2016-08-24 00:43:11 +03:00
Bo-Yi Wu 3c8861d1d2 remove empty data folder for mariadb.
ref:
d969a465ee/10.1/Dockerfile (L83)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:02:21 +08:00
Bo-Yi Wu 2d51548879 support phpmyadmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:01:34 +08:00
Mahmoud Zalt 4aa3902f32 Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh
Install and start workspace ssh
2016-08-22 03:30:17 +03:00
Luciano Gonçalves 1afad7f14c Add configuration to install aerospike php extension 2016-08-20 19:05:38 +01:00
Luciano Gonçalves 9bd70aadc8 Added aerospike cache service 2016-08-20 12:28:45 +01:00
Mahmoud Zalt e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
larryeitel 4e7e003e87 ssh keys 2016-08-17 19:24:00 -06:00
Tim Bracken cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Mahmoud Zalt 380c7bd1ec Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock:
  Proof of concept - LaraDock hosting multiple sites
2016-08-16 15:56:19 +03:00
Mahmoud Zalt b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:13:42 +03:00
Suteepat Damrongyingsupab a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel 93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
larryeitel d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Lialosiu 1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Maelle b7d38ef7dd parameter data in the path 2016-07-28 11:49:42 +02:00
Eric Pfeiffer 5e0e120950 add apache2 container. 2016-07-27 19:35:58 -05:00
Eric Pfeiffer 20adc9ca13 accidentally forgot to set INSTALL_NODE back to false. 2016-07-27 02:56:48 -05:00
Eric Pfeiffer 17e252a436 add non-root user for workspace container. 2016-07-27 02:43:38 -05:00
Mahmoud Zalt 062b7466f6 add composer.json to install global composer dependencies 2016-07-25 07:00:50 +03:00
Mahmoud Zalt e1dbb972f1 make Mongo, xDebug, Node, and prestissimo Installation Optional
on the Workspace and PHP-FPM Containers

+ general refactoring
2016-07-25 06:25:38 +03:00
Mahmoud Zalt 28a2d8e072 delete the .env file
making the central editing place is the docker-compose.yml file
2016-07-24 23:11:33 +03:00
orette ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
Eric Pfeiffer 9e7a669d5b incorporate upstream changes. 2016-07-19 22:01:20 -05:00
Eric Pfeiffer 9b084433c3 add caddy server. 2016-07-19 21:51:20 -05:00
Mahmoud Zalt 68576f9022 fix the volumes mapping 2016-07-13 17:04:06 +03:00
Mahmoud Zalt 2df00ecdad remove installing Prestissimo by default, to prevent the warning 2016-07-13 16:00:47 +03:00
Jack Fletcher dca0545293 Fixed incorrect `php-fpm` container mapping 2016-07-13 10:44:17 +01:00
Jack Fletcher 5f99478c76 Fixed workspace container mapping volumes to wrong container 2016-07-13 10:08:13 +01:00
Jack Fletcher 14cbe9f935 Moved volume container definitions
I've placed the `application` and `data` directories into a `volumes`
subdirectory. The top level `data` directory is now used for storing the
data used by the database (and other, if any) containers. The `data`
directory has also been added to the `.gitignore` file to prevent
accidental pushing of user data.
2016-07-12 17:11:57 +01:00
Jack Fletcher 42d63236f1 Changed the data container volume mappings
All of the database data volume mapping have been changed from the host's
`/var/lib` directory to locally alongside the laradock installation. This
should hopefully prevent issues where data disappears after containers are
restarted or data on the host machine is overwritten by accident (scary!)

Additionally this should make data easier to backup between installations
- especially on Windows where `/var` does not exist and is created
  transparently by Docker Machine/Windows beta.

This change will most likely cause data to disappear from existing
installations, however it may reappear if moved to it's new home.

References #137, #138
2016-07-12 16:39:08 +01:00
Jack Fletcher 11c65c4a00 Fix variable not set warning
Added an untracked `.env` file to the root directory to prevent the
`WARNING: The INSTALL_PRESTISSIMO variable is not set` message from being
displayed when `docker-compose` is run.

Added section in README for optional features.
2016-07-12 16:27:55 +01:00
Jack Fletcher bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt f3eb6a5fc4 Merge branch 'support-mongo'
* support-mongo:
  add Mongo Support to the Readme
  added php-mongodb extension
  simple reformatting
  set the original volume path
  get mongo volum from the data container
  added mongodb driver for php5.5 5.6
  added mongodb image + PHP7 driver

Fix Conflicts in:
	docker-compose.yml
	php-fpm/Dockerfile-55
	php-fpm/Dockerfile-56
	php-fpm/Dockerfile-70
	php-fpm/laravel.ini
2016-06-11 17:29:27 +03:00
Mahmoud Zalt a8b4b61e28 update the volumes mounting of the DB containers 2016-06-03 01:50:11 +03:00
Mahmoud Zalt 4c06a03ead get mongo volum from the data container 2016-06-01 14:44:10 +03:00
Bo-Yi Wu 99b54c5f7d remove unnecessary data volume of redis.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-01 13:44:41 +08:00
Amin Mkh 9c7054abe2 added mongodb image + PHP7 driver 2016-05-29 14:19:43 +03:00
Amin Mkh fd4253afb6 Update docker-compose.yml 2016-05-23 22:23:10 +03:00
Mahmoud Zalt 06c4c19a6f replace official neo4j image with tpires/neo4j
because of this wired error
(https://github.com/neo4j/docker-neo4j/issues/33)
2016-05-20 21:21:19 +03:00
Mahmoud Zalt 5c9eb97db5 Support Neo4j DB (beta) 2016-05-20 20:35:10 +03:00
Mahmoud Zalt 01a056dd25 make the workspace container run automatically 2016-05-19 20:49:16 +03:00
Mahmoud Zalt 2c05c87400 update the logs section 2016-05-18 07:56:12 +03:00
Mahmoud Zalt 4d8a798224 Create Application Container to hold App code 2016-05-18 07:13:19 +03:00
Mahmoud Zalt 377f24fe2b keep workspace container alive with tty 2016-05-18 06:28:31 +03:00
Mahmoud Zalt efd062fd88 fix linking containers to php-fpm instead of php 2016-05-18 02:54:23 +03:00
Mahmoud Zalt 504c9c59d5 Create workspace container
the workspace container is based from Ubuntu 16.04
it includes PHP-CLI 7 - Git - cURL and Vim for now
2016-05-18 02:46:27 +03:00
Mahmoud Zalt 4edf941872 rename php to php-fpm
preparing to add php cli as part of the workspace container
2016-05-18 02:43:23 +03:00
Mahmoud Zalt 405067d4af Separate the PHP versions to multiple dockerfiles
Because there's some difference in installing some libraries
between PHP 5 and PHP 7. There must be multiple php dockerfiles.
For that I created 3 docker files each of a different version,
this will make it easy for the users to switch between the PHP
version by just editing the docker-compose file and not touching
the dockerfiles.
2016-05-14 04:50:47 +03:00
Mahmoud Zalt 7f4e411d3d link containers to PHP 2016-05-14 04:20:20 +03:00
matt cf89670671 add memcached support 2016-05-12 02:17:39 +01:00
Mahmoud Zalt 12587bc712 Support Beanstalkd and Beanstalkd Console
Closes feature #38
2016-05-09 05:02:15 +03:00
Mahmoud Zalt 81f2602464 Support MariaDB
closes feature #21
2016-05-09 04:23:03 +03:00
Mahmoud Zalt ecefee4d65 update postgres volume path 2016-05-09 04:20:03 +03:00
Mahmoud Zalt de8cbb0605 simple updates to docker compose and readme 2016-05-08 15:21:59 +03:00
Mahmoud Zalt 5190da831a remove containers names from docker-compose
to void conflict while scalling using the scale command
2016-05-08 13:39:43 +03:00
Mahmoud Zalt 5d84c6481f revers the dependancies between php and the db
to prevent running all the db engines when php is running
2016-05-07 05:29:48 +03:00