Commit Graph

1387 Commits

Author SHA1 Message Date
1ead8aa060 Merge pull request #1228 from JeroenVanOort/master
added IMAP extension to workspace
2017-11-08 05:19:08 +02:00
7e393efbb6 add donations section 2017-11-08 05:16:50 +02:00
beecbe758b add Ads to docs 2017-11-08 04:55:58 +02:00
23ee4f6679 added IMAP extension to workspace 2017-11-06 11:12:02 +01:00
4e486280f4 Merge pull request #1219 from NickToony/master
Fixed: Missing PgSQL PDO drivers
2017-10-29 20:14:31 +02:00
9e807e39ee Updated: PHP-Worker documentation. 2017-10-29 13:03:59 +00:00
894b0197e0 Fixed: PHP-Worker has missing PGSQL drivers. 2017-10-29 12:54:05 +00:00
c2c30bfd0f update workspace base image version 2017-10-28 04:34:59 +03:00
152c896515 Merge pull request #1210 from nellonican/fix-env-vars
Fix variable issues.
v5.8.0
2017-10-25 15:36:27 +03:00
4682aff622 Merge pull request #1209 from nellonican/fix-grammar
Fix grammar
2017-10-25 15:35:49 +03:00
a31114955a Remove variable 2017-10-25 12:12:20 +02:00
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
eac717fb21 Fix grammar 2017-10-25 09:32:12 +02:00
c05c675408 Merge pull request #1201 from geraintdong/Add_pg_client_to_workspace_phpfpm
Add pg client to workspace phpfpm
2017-10-25 01:05:29 +03:00
60998ed1e4 Merge branch 'master' into Add_pg_client_to_workspace_phpfpm 2017-10-24 13:03:56 +07:00
05879bdda2 Merge pull request #1203 from arkadiusjonczek/master
Add Grafana container under Random Tools in introduction documentation
2017-10-20 06:14:13 +03:00
70a7bdca19 Merge remote-tracking branch 'upstream/master' 2017-10-19 18:52:50 +02:00
a71d5a8548 add Grafana to Random Tools list in introduction documentation 2017-10-19 18:51:17 +02:00
9fa3733622 Merge pull request #1202 from arkadiusjonczek/master
Add Grafana Container to laradock.io :)
2017-10-19 19:41:51 +03:00
b8e657b68f Merge remote-tracking branch 'upstream/master' 2017-10-19 14:31:02 +02:00
8aaa074af2 add Use Grafana section to documention 2017-10-19 14:29:50 +02:00
3005dde240 Merge pull request #1200 from TitasGailius/master
Use node:alpine image for laravel-echo-server
2017-10-18 22:15:42 +03:00
b3922995e1 Merge pull request #1199 from zuohuadong/master
add postgres for php-fpm
2017-10-18 22:15:22 +03:00
49e48edefd Merge remote-tracking branch 'upstream/master' 2017-10-18 14:41:20 +02:00
182386b514 removed grafana-storage 2017-10-18 14:38:10 +02:00
bea122a1fd removed depends_on from grafana and added Grafana port to env-example 2017-10-18 14:34:27 +02:00
7fb00658cf Add support for pgclient to workspace & php-fpm
+ Update sample .env file
2017-10-18 10:18:23 +07:00
ee03bb607f Add support for pgclient to workspace & php-fpm 2017-10-18 10:04:23 +07:00
9abd7c30f2 Use node:alpine image for laravel-echo-server 2017-10-17 18:05:21 +03:00
6a4509c0ca Merge branch 'master' into master 2017-10-17 12:27:42 +08:00
7f5d9d07d1 add postgresql for php-fpm 2017-10-17 12:23:48 +08:00
a5c505bf28 Merge pull request #1181 from zuohuadong/patch-9
use caddy in Apache-2.0
v5.7.1
2017-10-14 22:33:43 +03:00
427088e11b Merge pull request #1189 from maxhelias/feature/maildev
Add MailDev Container
2017-10-14 22:32:19 +03:00
3467821c28 Merge pull request #1184 from zuohuadong/patch-12
alpine be quckly
2017-10-14 22:31:51 +03:00
f9553dff4c Merge pull request #1183 from zuohuadong/patch-11
update jenkins version
2017-10-14 22:31:23 +03:00
8e556008d8 Add MailDev Container 2017-10-14 20:01:16 +02:00
17ea7b313f update 2017-10-12 18:54:09 +08:00
dff0e82ddb alpine be quckly
alpine be quckly
2017-10-12 18:42:11 +08:00
1702a5cc09 rm version 2017-10-12 18:40:12 +08:00
f15bc8e6b7 update jenkins version
update jenkins version to 2.73.2
update docker-compose version to 1.16.1
update TINI version to 0.16.1
2017-10-12 18:37:26 +08:00
903c77421c Merge pull request #1182 from khoanguyen96/fix-typos-contributing
fix typos in contributing
2017-10-12 05:47:33 +03:00
2bedfdd9d7 fix typos in contributing 2017-10-11 18:08:24 -07:00
525c4313a0 use caddy in Apache-2.0
see:   https://caddyserver.com/products/licenses

so, I use caddypulg, it is  free
2017-10-11 19:48:07 +08:00
01c358b6bc Merge pull request #1176 from taufek/tj-chrome-driver-var
Move Chrome Driver Version to Env
v5.7.0
2017-10-06 20:44:30 +03:00
a0685705c0 Merge pull request #1175 from taufek/tj-dusk-doc-2
Update Dusk Documentation
2017-10-06 20:43:40 +03:00
98b2b2e47b Update Dusk Documentation
Added new option on how to setup and run Dusk tests without Selenium.
2017-10-07 00:47:02 +08:00
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
a2edf57e3b Merge pull request #1172 from taufek/tj-chrome-for-dusk
Install Dependencies to Run Dusk Tests
2017-10-03 11:43:49 +03:00
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
508e9ebd9e added grafana docker container 2017-10-01 02:36:55 +02:00