Mahmoud Zalt
a0c5ef75d2
upgrade docker-compose to v3
2018-04-05 16:43:22 +03:00
mfpang
f810962d84
add APACHE_DOCUMENT_ROOT in env-example file
2018-03-18 17:38:49 +08:00
Suhaib Khan
f90a81ef8b
Update mysql version to latest
...
Signed-off-by: Suhaib Khan <suheb.work@gmail.com>
2018-03-13 11:52:20 +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
Yu-Lung Shao (Allen)
ca376935e1
Merge pull request #1382 from desaroger/php-72-pr
...
Add PHP 7.2 support and fix issues on 5.6-7.0-7.1 versions
2018-02-26 10:43:16 +08:00
Bolo Lai
4b5a1ef628
support custom composer repo url and npm registry url
2018-02-21 13:13:19 +08:00
desaroger
72d550e6e5
Set php default version to 72
2018-02-16 19:10:03 +01:00
desaroger
91131f0963
Add PHP 7.2 support
2018-02-16 18:40:13 +01:00
Sven Slijkoord
3b219d2974
Added env entry PHP_FPM_INSTALL_IMAP
2018-02-13 19:15:49 +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
x
c44338e370
workspace container adds swoole
2018-01-09 11:25:57 +08: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
694b39ddf4
Merge pull request #1293 from Rhymond/patch-1
...
Compatibility for COMPOSE_FILE
2017-12-04 08:51:32 +01:00
Raymond
cf136f891b
Windows compatibility
...
COMPOSE_PATH_SEPARATOR
If set, the value of the COMPOSE_FILE environment variable will be separated using this character as path separator.
2017-12-03 23:04:20 +00:00
francoisfaubert
47c74d1334
Added clarification on how to split multiple docker-compose files within COMPOSE_FILE on Windows
2017-11-23 14:02:56 -05:00
Mahmoud Zalt
e779bf96ab
reorder some keys in the .env for easier modification
2017-11-23 20:52:42 +02:00
牟勇
8d410e9c82
merge upstream
2017-11-23 13:42:33 +08:00
Jeff
73b95357ac
Specifying included docker-compose files in the .env is more flexible than hardcoding in the shell script.
2017-11-22 10:48:22 +13:00
Mahmoud Zalt
65a8bbc6a4
Merge pull request #1262 from jeff-h/issue-171
...
Fixes #353 and allows easier dev & prod environments
2017-11-21 22:56:04 +02: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
9835a20863
Remove useless...
...
Remove useless...
2017-11-15 13:05:26 +08:00
牟勇
a99281cda8
Change application source from dl-cdn.alpinelinux.org to aliyun source
2017-11-14 21:03:19 +08:00
Mahmoud Zalt
2fc0f3cb2e
improve readability of the .env file
2017-11-14 12:53:30 +02:00
Jérôme Desseaux
c5ccc2f4ff
soving python issue when using INSTALL_NODE=true and VueJS with Laravel.
2017-11-12 11:04:57 +01: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
a31114955a
Remove variable
2017-10-25 12:12:20 +02: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
b8e657b68f
Merge remote-tracking branch 'upstream/master'
2017-10-19 14:31:02 +02: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
7fb00658cf
Add support for pgclient to workspace & php-fpm
...
+ Update sample .env file
2017-10-18 10:18:23 +07:00
Zuohuadong
7f5d9d07d1
add postgresql for php-fpm
2017-10-17 12:23:48 +08:00
Maxime Helias
8e556008d8
Add MailDev Container
2017-10-14 20:01:16 +02:00
Zuohuadong
17ea7b313f
update
2017-10-12 18:54:09 +08: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
Kévin Mathieu
04770bc4ec
Add PHP LDAP extension if needed
2017-09-29 14:56:28 +02:00
Geraint Dong
ca9c07eb76
Add Postgre SQL Support for php-fpm & edit webserver session storage location
...
+ Add sample config
2017-09-25 18:40:47 +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
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
terry
93d5b318fe
add drupal console to workspace
2017-08-19 22:58:40 +08:00
Ary Widiantara
e4f4de47e7
[UPDATE] change config redis from docker compose to env
2017-08-09 10:17:53 +07:00
James Whiteman
3801973b15
Update env-example
...
Added missing symfony install variable and added new python install variable
2017-08-07 08:45:25 +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
Arian Acosta
3bf572b7a4
added colors
2017-07-15 13:52:23 -04: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
Vincent Chu
bc1c957f47
add APACHE_SITES_PATH variable
2017-06-30 06:22:55 -04: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
Shao Yu Lung
c913c429c0
change DATA_SAVE_PATH
2017-05-25 10:04:41 +08:00
Shao Yu Lung
d4caddcaed
move default config DATA_SAVE_PATH from /tmp to ~/.laradocc/data
...
avoid lost data and windows no have /tmp folder.
2017-05-25 09:56:14 +08: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
Winfried
aab2017bda
Merge pull request #910 from wxb/master
...
add swoole extension config
2017-05-09 07:10:02 +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
wxb
31d21c74a0
add swoole extension config
2017-05-08 01:42:46 +08: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
8246863cd7
Partly reverting 690137a3
2017-05-01 12:36:31 +02:00
Winfried
080fffba3d
Merge branch 'master' into 849-apache-webroot
...
# Conflicts:
# DOCUMENTATION/content/getting-started/index.md
2017-04-28 21:14:39 +02:00
Mike Erickson
db353fbbdc
Merge pull request #854 from winfried-van-loon/792-V8JS-typo
...
Fixing typo in the workspace V8 args
2017-04-27 08:40:13 -07:00
Winfried
1db18b1cec
Changing PMA/adminer default port to 8080
...
Fixes issue #828
2017-04-23 23:40:27 +02:00
Winfried
ef6071bff0
Fixing typo in the workspace V8 args
2017-04-23 21:16:58 +02:00
Winfried
690137a349
Changing docroots to have the same defaults
...
Caddy, NGINX and Apache2 should have the same default application paths. The `public/` path suffix is now added in the dotenv file to be able to use Laradock for non-laravel projects as well. Also, updated the documentation.
2017-04-23 20:44:18 +02:00
Mahmoud Zalt
0cf26af724
set default data path to `/tmp`
2017-04-22 15:05:52 -04:00
Mahmoud Zalt
80991483bc
default php to 7.1
2017-04-21 22:37:59 -04:00
Mahmoud Zalt
e92286c381
more styling for the .env
2017-04-21 10:15:41 +12:00
Mahmoud Zalt
e022e7163f
hopfully making the .env file easier to edit!
2017-04-21 10:15:36 +12:00
Mahmoud Zalt
4ce1d7f64a
upgrade base images for php-fpm and workspace.
...
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
2017-04-21 10:13:53 +12:00
Diego Antunes
5aab3add44
Added blackfire.io
2017-04-21 10:02:54 +12: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
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
e10217c64d
Fixing ghostscript env option
...
Forgot something :(.
2017-04-11 21:52:34 +02:00
Winfried
80a60d58cf
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:22:07 +02:00
James Whiteman
3a62814fdc
Update env-example
...
added install symfony to workspace
2017-04-07 10:19:23 +12: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
Mahmoud Zalt
43f4211abb
Merge pull request #740 from winfried-van-loon/724-php-version
...
Simplifying PHP_FPM version
2017-04-04 20:44:58 -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
e861348475
Adding option to install Php5.x MySQL #722
2017-04-04 16:39:53 +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
a8d7937889
Add ADM_PORT to env-example
2017-03-29 22:12:53 -07:00
ZeroC0D3 Team
cf9abcd5b8
Change env-example varnish backend host to 'workspace'
2017-03-26 12:33:27 +07:00
ZeroC0D3 Team
236665d7d3
Change haproxy port to 8085
2017-03-26 08:13:14 +07:00
ZeroC0D3 Team
38545cfffd
Update env-example for mssql
2017-03-26 07:28:04 +07:00
Ignacio Cabrera
6b61c7d454
adding MSSQL support
2017-03-24 12:31:38 -03:00
ZeroC0D3 Team
40422ab4b0
Update environment for varnish & haproxy
2017-03-23 13:53:26 +07:00
Mahmoud Zalt
09c5ad273c
re-position `COMPOSE_CONVERT_WINDOWS_PATHS`
2017-03-21 10:06:26 -04:00
Mahmoud Zalt
99b8a45f3b
Merge branch 'master' of https://github.com/Laradock/laradock
...
* 'master' of https://github.com/Laradock/laradock :
Fixed path variable for windows users
fixes up so Yarn is installable again
align file format
for file format
use '`' to quote identifier
use CREATE USER to define account authentication characteristics
use CREATE USER to define account authentication characteristics
Updated project example confs to fit nameing convention used in apache example
Updated project example confs to not have gitignore issues
docker-71 file now also works with new env-example setup
Adding Arg to docker-compose
Adding MSSQL Support
2017-03-21 10:02:10 -04:00
Mahmoud Zalt
4f416da26b
add missing env variable `APPLICATION`
...
closes #703
2017-03-21 10:01:37 -04:00
Marius van Zundert
c6e9b1ed5d
Fixed path variable for windows users
2017-03-21 11:21:26 +01:00
Thor Erik Lie
8869b22a1d
fixes up so Yarn is installable again
2017-03-20 10:33:25 +01:00
Mahmoud Zalt
3e61554625
Merge pull request #687 from jefhar/jefhar-patch-1
...
Jefhar patch 1
2017-03-17 11:09:45 -04:00
picospuch
8e89725381
Update env-example
2017-03-17 16:37:42 +08:00
jefhar
08086be4c5
PHP_FPM_INSTALL_INTL env-example
...
added PHP_FPM_INSTALL_INTL=false to PHP_FPM_INSTALL_INTL=false
2017-03-16 23:26:54 -07: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
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
Marius van Zundert
0d41c3d65e
updated env-example and removed .env.example
2017-03-15 09:12:07 +01: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
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