Commit Graph

2154 Commits

Author SHA1 Message Date
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
Luciano Jr
d3fb967f0f Merge pull request #21 from laradock/master
Up-to-date
2017-09-04 10:49:41 +01:00
Eugene Kirdzei
a36620c3bd Restart build 2017-09-04 12:05:34 +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
Mahmoud Zalt
fdcf9117ac Merge pull request #1115 from joaorobertopb/patch-1
Changes to correct version of dockerfile
2017-08-30 01:07:37 +03:00
João Roberto P. Borges
f800a3221a Changes to correct version of dockerfile
- Removes extra spaces
2017-08-29 12:54:01 -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
Mahmoud Zalt
ebeddcba23 Merge pull request #1097 from macghriogair/master
[php-worker] dedicated dockerfile for php 7.0/7.1
2017-08-23 21:11:45 +03:00
Mahmoud Zalt
dba37307b5 Merge pull request #1093 from zuohuadong/patch-7
fix to backup and fix max client
2017-08-23 21:11:02 +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
Mahmoud Zalt
38fb49bccc Merge pull request #1095 from exfriend/patch-2
Fix supervisord.conf file path
2017-08-17 04:37:18 +03:00
Vladislav Otchenashev
08896f9fb6 Fix supervisord.conf file path
otherwise image ignores the supplied supervisord.conf
2017-08-16 00:33:51 +03:00
Mahmoud Zalt
dcab211b07 Merge pull request #1094 from zuohuadong/patch-8
add pgadmin backup volumes
2017-08-14 23:53:31 +03: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
zuohuadong
30b626d43e fix to backup and fix max client
in  this version, you can backup postgresql
2017-08-14 10:04:11 +08:00
Mahmoud Zalt
586a225c11 Merge pull request #1089 from ELD/add-dusk-support-and-docs
add docs on running Laravel Dusk tests
2017-08-11 10:26:31 +03:00
Eric Dattore
c099a51d52 add docs on running Laravel Dusk tests 2017-08-10 21:08:09 -06:00
Mahmoud Zalt
245ddf3441 update documentation link in the readme 2017-08-09 16:18:29 +03:00
Mahmoud Zalt
0192346cf2 Merge pull request #1082 from arywidiantara/master
[UPDATE] change config redis from docker compose to env
2017-08-09 11:28:06 +03:00
Ary Widiantara
e4f4de47e7 [UPDATE] change config redis from docker compose to env 2017-08-09 10:17:53 +07:00
Mahmoud Zalt
69ccd74d2e Update Improve MAC speed docs 2017-08-08 15:01:41 +03:00
Mahmoud Zalt
a3c66fdecf Merge pull request #1080 from zuohuadong/patch-6
use openssh-client not  openssh*
2017-08-08 09:03:55 +03:00
Mahmoud Zalt
9b8eee6a98 Merge pull request #1079 from zuohuadong/patch-5
add demo and  use  caddy example for laravel
2017-08-08 09:03:18 +03:00
zuohuadong
668acd66c1 use openssh-client not openssh*
https://hub.docker.com/r/abiosoft/caddy/~/dockerfile/
2017-08-08 11:36:16 +08:00
zuohuadong
b25215684b add demo and use caddy example for laravel
https://github.com/caddyserver/examples/blob/master/laravel/Caddyfile
2017-08-08 11:33:42 +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
Mahmoud Zalt
2082659fb1 update Install Symfony steps in the docs 2017-08-07 05:57:45 +03:00
Mahmoud Zalt
1fe2df73e4 Merge pull request #1077 from hounded/master
Missing symfony variables in env-example and workspace. Added python as an option to workspace
2017-08-07 05:51:58 +03:00
James Whiteman
05c7f9186a Update docker-compose.yml
Added missing symfony and python options to workspace
2017-08-07 08:47:53 +12: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
James Whiteman
6d89424e91 Update Dockerfile-70
Add python option to workspace
2017-08-07 08:42:55 +12:00
Yu-Lung Shao (Allen)
b1c1e6e187 Merge pull request #1075 from bestlong/fix-php-worker-rm-error
fix php-worker build error
2017-08-04 15:45:48 +08:00
Shao Yu Lung
972bdd90a3 fix rm error
ERROR INFO:

Step 4/5 : RUN rm -r /var/lib/apt/lists/*
 ---> Running in 4a3aa49e0e6e
rm: can't remove '/var/lib/apt/lists/*': No such file or directory
ERROR: Service 'php-worker' failed to build: The command '/bin/sh -c rm -r /var/lib/apt/lists/*' returned a non-zero code: 1
2017-08-04 15:11:10 +08:00
Mahmoud Zalt
2af40b0ba1 fix #970. remove the required public directory in the /var/www 2017-08-04 00:51:20 +03:00
Mahmoud Zalt
5c0b8316b1 make the PHP_UPSTREAM config for NGINX and Apache identical 2017-08-04 00:50:20 +03: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