Commit Graph

267 Commits

Author SHA1 Message Date
Tom Fenech
1f193a5310 Add missing syntax to continue line 2018-04-04 20:29:14 +02:00
Mahmoud Zalt
0586247e3f
Merge branch 'master' into debug-workspace-scheduler 2018-04-04 17:48:46 +03:00
Daniel Hunsaker
31a4e29c81 Apply COPY vs ADD best practices
Should only use `ADD` for URLs (and even then, `curl` or `wget` are preferred, for numerous reasons, even within this repo) and when extracting archive contents as part of the `ADD` operation; otherwise `COPY` is clearer and (slightly) more efficient.
2018-04-04 06:13:28 -06:00
Mahmoud Zalt
805d7f94e8
Merge pull request #1399 from mariano-dagostino/1372-ssh
Make possible to login via ssh using the laradock user.
2018-03-25 19:14:10 +03:00
Shao Yu Lung
e6817288f8 workspace sql server section: increase install check 2018-03-24 14:23:01 +08:00
Shao Yu Lung
141d2dbe7f fix file owner. 2018-03-23 16:09:10 +08:00
Shao Yu Lung
4d384c0a67 fix mistake #1427 about user aliases. 2018-03-23 15:17:35 +08:00
Andrew Baranov
245515b41d Use xDebug with Laravel scheduler inside workspace container. 2018-03-22 12:38:42 +03:00
Shao Yu Lung
99c7758799 update default install arg and remove extra run command 2018-03-20 10:59:59 +08:00
Shao Yu Lung
5773d270ca clean up aerospike and empty line 2018-03-19 22:15:24 +08:00
Shao Yu Lung
70e10a4953 MAINTAINER is deprecated 2018-03-16 17:34:47 +08:00
Shao Yu Lung
1ab5b405a9 remove wrong comment info. 2018-03-16 16:24:20 +08:00
Shao Yu Lung
415a6159f6 fix workspace mssql build fail 2018-03-16 15:22:21 +08:00
Yu-Lung Shao (Allen)
2cf368e2cc
Arg not consumed (#1430)
* fix arg CHROME_DRIVER_VERSION not consumed
* fix arg INSTALL_V8JS not consumed
2018-03-16 11:39:32 +08:00
Yu-Lung Shao (Allen)
f08c3bda4d
workspace in gitlab build fail (#1429)
fix "sed: couldn't open temporary file /home/laradock/sed6KGnMb: Permission denied"
2018-03-16 10:41:54 +08:00
Shao Yu Lung
40796651f6 workspace Dockerfile remove duplicate command in User Aliases section. 2018-03-15 11:22:43 +08:00
Yu-Lung Shao (Allen)
188a7d7624
Merge pull request #1425 from suheb/fix/imagemagick
Run apt-get update before installing imagemagick in workspace
2018-03-15 09:26:00 +08:00
Yu-Lung Shao (Allen)
3f1f60da91
Merge pull request #1412 from CantonBolo/optimize
Custom composer repo and npm registry url in php72
2018-03-15 09:24:07 +08:00
Suhaib Khan
ce8bdb91cf Run apt-get update before installing imagemagick in workspace
Signed-off-by: Suhaib Khan <suheb.work@gmail.com>
2018-03-13 12:18:08 +05:30
Justen Chen
b7b7690bbe The PPA of 'pinepain/libv8-5.4' has been deprecated, use 'pinepain/libv8-archived' instead 2018-03-09 11:43:40 +08:00
Bolo Lai
e054b622f3 Custom composer repo and npm registry url in php72 2018-03-05 02:08:11 +08:00
Shao Yu Lung
4169a9b357 Support Prestissimo 2018-02-27 08:12:16 +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
Mariano D'Agostino
9b328cce1f Make possible to log in via ssh using the laradock user 2018-02-26 09:52:50 -03:00
Yu-Lung Shao (Allen)
3b0f271782
Merge pull request #1368 from Alexanderwmc/my-fix-branch
update nvm to 0.33.8
2018-02-26 20:26:38 +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
Yu-Lung Shao (Allen)
16f88029e0
Fix install deployer fail
Install deployer from phar
2018-02-22 17:20:28 +08:00
Bolo Lai
4b5a1ef628 support custom composer repo url and npm registry url 2018-02-21 13:13:19 +08:00
desaroger
76da02e779 Add PHP version checkers on all php-related dockerfiles 2018-02-17 09:26:46 +01:00
desaroger
a52a944003 Install deployer from phar to be compatible with laravel 4 2018-02-17 08:54:02 +01:00
desaroger
4cffb2fc99 Avoid to install PHP latest on a PHP 7.1 dockerfile 2018-02-17 08:37:25 +01:00
desaroger
92dda4695c Changes to make travis work, copied from spyridonas PR 2018-02-16 21:12:14 +01:00
desaroger
c42e039945 Downgrade swoole to pass travis 5.6 test 2018-02-16 21:07:45 +01:00
desaroger
91131f0963 Add PHP 7.2 support 2018-02-16 18:40:13 +01:00
Shao Yu Lung
f53565f2a6 Fix workspace, PHP56 build fail
pecl/swoole requires PHP (version >= 7.0.0)
2018-02-11 13:04:20 +08:00
Alexanderwmc
87e1bdeb92 update nvm to 0.33.8 2018-02-06 14:29:41 +08: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
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
Fruty
0aaa2c742e Added support for AMQP extension in workspace and php-fpm containers. 2017-12-28 14:25:32 +02:00
Fruty
4ada536d68 Added laradock user ssh supports for php5.6 and php7.0. 2017-12-28 12:56:11 +02:00
Fruty
222febadb5 Allowed laradock user use ssh settings (copied from root). 2017-12-28 12:53:33 +02:00
Mahmoud Zalt
71cc109334 update base tags 2017-12-17 21:31:37 +01:00
Mahmoud Zalt
0d804cd29a enable remote_connect_back instead of defining remote host in xdebug
and modify the default var display
2017-12-17 21:31:05 +01:00
Shao Yu Lung
cd1c9c0d44 fix aerospike build fail 2017-12-10 16:13:39 +08:00
Nate Morris
6ea86fbce3 Add LDAP support to PHP 5.6 workspace
Issue #1296:
PHP 7.0 and 7.1 workspaces support adding the PHP LDAP module. The
PHP 5.6 workspace file seems to have missed this for some reason.
2017-12-05 12:52:35 -06:00
Thorvald Falkenburg
8dea201b68 Remove python installation from Dockerfile-71
Python can be installed by using the WORKSPACE_INSTALL_PYTHON
variable in the .env file. Fixes #1238
2017-11-16 21:31:43 +01:00
Mariano D'Agostino
05dd1b0339 Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog 2017-11-13 13:37:04 -03:00
Thorvald Falkenburg
b47963c80d Fix Dockerfile
Building the workspace docker image with Dockerfile-71 failed because
of missing "&&"
2017-11-12 19:45:44 +01: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
Mahmoud Zalt
c2c30bfd0f update workspace base image version 2017-10-28 04:34:59 +03: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
Geraint Dong
ee03bb607f Add support for pgclient to workspace & php-fpm 2017-10-18 10:04:23 +07: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
Ademir Mazer Jr [ Nuno ]
3f7988060e Add pecl before mongo install 2017-09-28 17:16:05 -03:00
luciano
61144ab2d9 Change the wrong link to aerospike client PHP 2017-09-25 18:30:00 +01: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
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
801ccd47d2 Merge pull request #1121 from freearhey/master
Added support of ImageMagick
2017-09-06 14:59:29 +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
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
Eugene Kirdzei
cddc934e1e Fix phpreddis installation for all versions of php 2017-09-04 11:33:14 +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
Mahmoud Zalt
8e84fbbec2 add missing symfony and python to workspace and remove useless alias 2017-08-07 12:36:02 +03:00
Mahmoud Zalt
1e650d8643 Merge branch 'master' of https://github.com/laradock/laradock into dev
* 'master' of https://github.com/laradock/laradock:
  update Install Symfony steps in the docs
  Update docker-compose.yml
  Update env-example
  Update Dockerfile-70
  fix rm error
2017-08-07 12:06:51 +03:00
Mahmoud Zalt
4977b0f92f fix alias for phpunit to load from current directory 2017-08-07 12:06:11 +03:00
James Whiteman
6d89424e91 Update Dockerfile-70
Add python option to workspace
2017-08-07 08:42:55 +12:00
Mahmoud Zalt
004e4354aa add more aliases and functions for better development in the workspace 2017-08-03 08:06:48 +03:00
Mahmoud Zalt
d99cf73bf0 edit alias, use the phpunit of the project 2017-08-03 07:31:41 +03:00
terry
a590ed78ce fixed #1068 2017-07-26 13:15:12 +08:00
Ujjwal Ojha
9dda2f6b9f image optimizers libraries 2017-07-10 18:49:39 +05:45
Ujjwal Ojha
7765df1076 fix php7.1-xdebug because of missing new line 2017-07-08 10:00:52 +05:45
Rudolf Gitler
f2f665dc08 Update Dockerfile-71
php7.1-xdebug instead of php-xdebug instead.
apt-get update needed therefore
2017-07-07 13:21:14 +02:00
Edmund Luong
262b9f20a3 Set default setting to false for the following options in workspace:
- Laravel Envoy
- Laravel Installer
- LinuxBrew
- MS SQL Server
2017-06-09 11:00:42 -04:00
mycontroller
0290142bf4 Dockerfile-56 fill missing MSSQL section 2017-05-31 13:41:30 +08:00
Mahmoud Zalt
18b6c1b907 Merge pull request #984 from Obscuresounds/workspace-fix-bash-command-not-found
Exec issue with workspace bugfix
2017-05-30 17:51:05 +03:00
Mahmoud Zalt
7c9d7a6de6 Merge pull request #965 from aven-li/master
fix mongodb php extension config
2017-05-30 17:49:33 +03:00
Lawrence Eldridge
d0c0a8895e add global instance of larval installer for fresh projects. (#988) 2017-05-30 09:05:30 -05:00
Lawrence Eldridge
5a47080859 This issue relates to https://github.com/laradock/laradock/issues/563, which also occurs on Mac. This has been one of the solutions proposed. 2017-05-27 14:07:45 +01:00
avenli
9e81f92d58 fix mongodb php extension config 2017-05-24 14:47:12 +08:00
Cecil van Enter
4dfc794b6e correct xdebug sed in workspace 2017-05-11 22:37:00 +02:00
Winfried
3134221445 Fixing aerospike 2017-05-07 16:56:15 +02:00
Winfried
4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Winfried
26ecb09685 Merge branch 'fix-workspace-user-laradock-env' of git://github.com/Lednerb/laradock into Lednerb-fix-workspace-user-laradock-env
# Conflicts:
#	workspace/Dockerfile-56
#	workspace/Dockerfile-70
#	workspace/Dockerfile-71
2017-05-07 15:24:57 +02:00
Sascha Brendel
e454d1c8a7
Fixed broken adoption for PUID and PGID for Non-Root User laradock. 2017-05-07 12:43:20 +02:00
Shao Yu Lung
69c9202304 apt-get update just need run at first, after add-apt-repository or update apt source list. 2017-05-07 01:08:56 +08:00
Shao Yu Lung
59293d7a99 set php-fpm and workspace use sam sqlsrv version. 2017-05-06 18:48:44 +08:00
Shao Yu Lung
2f010506eb aerospike-client-php version to 3.4.14 2017-05-05 18:21:45 +08:00
Winfried
4f24550463 Merge pull request #891 from bestlong/speed-up-git-clone-and-save-space
git clone only need one depth.
2017-05-05 07:35:48 +02:00
Shao Yu Lung
e579b18794 workspace/Dockerfile-70 duplicate MSSQL section. 2017-05-05 13:07:56 +08:00
Shao Yu Lung
fde406bafa Dockerfile-71 fill missing MSSQL section 2017-05-05 12:33:09 +08:00