Commit Graph

2946 Commits

Author SHA1 Message Date
zuohuadong
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
Mahmoud Zalt
01c358b6bc Merge pull request #1176 from taufek/tj-chrome-driver-var
Move Chrome Driver Version to Env
2017-10-06 20:44:30 +03:00
Mahmoud Zalt
a0685705c0 Merge pull request #1175 from taufek/tj-dusk-doc-2
Update Dusk Documentation
2017-10-06 20:43:40 +03:00
Taufek Johar
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
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
Mahmoud Zalt
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
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
Mahmoud Zalt
6cff904eba Merge pull request #1170 from id2s/feature-php-ldap-workspace
Add PHP LDAP extension if needed
2017-09-29 20:15:46 +03:00
Kévin Mathieu
04770bc4ec Add PHP LDAP extension if needed 2017-09-29 14:56:28 +02:00
Mahmoud Zalt
1281490c39 Merge pull request #1168 from nunomazer/master
Add pecl before mongo install on Dockerfile-56 to stop mongodb breaking building
2017-09-29 00:57:45 +03:00
Ademir Mazer Jr [ Nuno ]
3f7988060e Add pecl before mongo install 2017-09-28 17:16:05 -03:00
Mahmoud Zalt
615cb72eab Merge pull request #1167 from ifdattic/patch-1
Fix typo
2017-09-28 19:22:37 +03:00
Andrew Marcinkevičius
e036e69da2 Fix typo 2017-09-28 16:59:21 +03:00
Mahmoud Zalt
8989c73711 Merge pull request #1163 from luciano-jr/FixAerospikeClientLink
Fix aerospike client link
2017-09-25 23:32:49 +03:00
luciano
61144ab2d9 Change the wrong link to aerospike client PHP 2017-09-25 18:30:00 +01:00
Luciano Jr
221edf4bb2 Merge pull request #23 from laradock/master
Just update the fork
2017-09-25 18:17:10 +01: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
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
Geraint Dong
3cc917c9de Add Postgre SQL Support for php-fpm & edit webserver session storage location 2017-09-25 17:30:30 +07:00
Mahmoud Zalt
5a073ae841 Merge pull request #1158 from taufek/tj-aliases-update
Add artisan aliases
2017-09-25 01:16:41 +03:00
Taufek Johar
8c1e71eca5 Add artisan aliases
Added below php artisan commonly used aliases:

```
dusk =  php artisan dusk
fresh = php artisan migrate:fresh
refresh = php artisan migrate:refresh
rollback = php artisan migrate:rollback
```
2017-09-24 22:16:04 +08:00
Mahmoud Zalt
c0e823b8d2 Merge pull request #1153 from taufek/tj-terraform
Add Terraform to Workspace
2017-09-24 00:56:25 +03: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
Mahmoud Zalt
f765afd4c2 Merge pull request #1151 from luciano-jr/AddAerospikeExtensionOnPhpFpm
Add aerospike.so line to be load on php-fpm
2017-09-22 19:32:19 +03:00
Mahmoud Zalt
6ea49a0683 Merge pull request #1150 from samdark/fix-typo
Fixed typo in "nginx"
2017-09-22 19:31:55 +03:00
luciano
998aa1365e Add aerospike.so line to be load on php-fpm 2017-09-22 12:23:20 +01:00
Luciano Jr
f2420ec52c Merge pull request #22 from laradock/master
Just update the fork
2017-09-22 12:13:42 +01:00
Alexander Makarov
fe254e86e3 Fixed typo in nginx [skip ci] 2017-09-22 13:10:08 +03:00
Mahmoud Zalt
53b7f75500 Merge pull request #1145 from vjekoslav/master
Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca…
2017-09-20 20:09:47 +03:00
Vjekoslav Nikolic
4150f0b140 Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca841a 2017-09-20 05:44:36 -07:00
Mahmoud Zalt
d340b6e60f Merge pull request #1140 from deleugpn/patch-1
Make it easier to solve nginx build stuck
2017-09-19 01:39:15 +03:00
Mahmoud Zalt
e7357eab83 Merge pull request #1142 from roelal/apache_socket_timeout
add APACHE_PHP_UPSTREAM_TIMEOUT
2017-09-19 01:38:28 +03:00
Roel Arents
110aa91c59 add APACHE_PHP_UPSTREAM_TIMEOUT 2017-09-18 15:24:48 +02:00
Marco Aurélio Deleu
e5aef41dd2 Make it easier to solve nginx build stuck 2017-09-18 13:07:30 +02:00
Mahmoud Zalt
ae048e6c66 Merge pull request #1137 from JoelRSimpson/patch-1
Update docker-compose.yml
2017-09-15 22:08:55 +03: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
Mahmoud Zalt
655b9a1526 Merge pull request #1128 from chkm8/aws-ebcli
Aws ebcli
2017-09-13 00:17:05 +03:00
Melchor O. Abcede Jr
7ac37ecd35 added aws docs 2017-09-12 04:30:53 +08:00
Melchor O. Abcede Jr
792789e479 added eb cli container 2017-09-12 04:13:44 +08:00
Mahmoud Zalt
801ccd47d2 Merge pull request #1121 from freearhey/master
Added support of ImageMagick
2017-09-06 14:59:29 +03:00
Arhey
5c5f94600a Rename laravel.pool.conf to xlaravel.pool.conf
Fix issue #1011
2017-09-06 00:22:18 +03:00
Arhey
b2e372054f Fixed php-fpm build 2017-09-05 23:36:30 +03:00
Arhey
0a23d53ee5 Move php-imagick to php-fpm and enable it 2017-09-05 21:47:47 +03:00
Arhey
f6552aca97 Added support of ImageMagick to php-fpm 2017-09-05 21:09:34 +03:00
Mahmoud Zalt
e9806d9bca Merge pull request #1120 from WanchiaTsai/add-env-path-for-node
add ENV PATH, fix the problem of docker-compose exec workspace npm(or…
2017-09-05 16:30:44 +03:00
wanchia
e56801846b add ENV PATH, fix the problem of docker-compose exec workspace npm(or other node-related script). 2017-09-05 11:06:53 +08:00
Arhey
f9e6acd4e1 Fix syntax error 2017-09-05 03:15:24 +03:00
Arhey
b61ff4f484 Added support of ImageMagick 2017-09-05 02:36:24 +03:00
Mahmoud Zalt
8485add87a Merge pull request #1117 from masterjus/fix-php_redis-installation
Fix Php Redis extension installation
2017-09-04 22:40:21 +03:00