Commit Graph

1381 Commits

Author SHA1 Message Date
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
Mahmoud Zalt
a365425c73 Merge branch 'master' of github.com:laradock/laradock
* 'master' of github.com:laradock/laradock:
  format the readme.md file
  fix travis ci hugo job get "cannot create directory" error.
  fixed #1068
  update some `guide` format in the documentation
2017-08-01 22:12:59 +03:00
Mahmoud Zalt
c836500488 add symfony, laravel and app nginx sites sampels 2017-08-01 22:12:43 +03:00
Mahmoud Zalt
318ca3f81c format the readme.md file 2017-07-29 10:03:50 +03:00
Yu-Lung Shao (Allen)
82219ededb Merge pull request #1072 from bestlong/fix-travis-ci-hugo-job-failed
fix travis ci hugo job get "cannot create directory" error.
2017-07-28 00:23:18 +08:00
Shao Yu Lung
d6ff224b0d fix travis ci hugo job get "cannot create directory" error. 2017-07-27 23:45:18 +08:00
Mahmoud Zalt
b1144bba7e Merge pull request #1069 from terryzwt/master
fixed #1068 drush need mysql-client installed
2017-07-26 20:08:03 +03:00
terry
a590ed78ce fixed #1068 2017-07-26 13:15:12 +08:00
Mahmoud Zalt
f852789720 update some guide format in the documentation 2017-07-26 03:27:24 +03:00
Mahmoud Zalt
d32cfb31b1 update ISSUE_TEMPLATE.md context 2017-07-26 02:42:24 +03:00
Mahmoud Zalt
e671f4c929 Update PULL_REQUEST_TEMPLATE.md context 2017-07-26 02:40:26 +03:00
Mahmoud Zalt
aef2769e60 Merge branch 'hackel-change-mysql-version'
* hackel-change-mysql-version:
  Add documentation on the MYSQL_VERSION variable.
  Allow specifying the version of MySQL to install in .env file.
2017-07-25 23:33:58 +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
Mahmoud Zalt
e7a16bb98e Merge pull request #1063 from St4inl3ss/remote_debug_documentation_phpStorm_linux
Xdebug configuration for Linux on PhpStorm
2017-07-21 10:58:44 +03:00
stainlessphil
e496a82150 Xdebug configuration for Linux on PhpStorm
Added images and explanations for setting up remote debugging for PhpStorm on Linux

Also modified slightly Install Xdebug section to keep reading consistent
2017-07-20 10:52:13 -04:00
Mahmoud Zalt
f258b38a18 Merge pull request #1058 from arianacosta/integrating_docker_sync
Integrating docker sync
2017-07-16 22:26:08 +03:00
Arian Acosta
a80fb99d21 added support for docker-sync and added sync.sh script to simplify the use of docker-sync with laradock 2017-07-16 10:09:46 -04:00
Arian Acosta
6b0ee10988 added docker sync documentation 2017-07-16 10:06:12 -04:00
Arian Acosta
1e2d368e43 improved docs 2017-07-15 19:28:02 -04:00
Arian Acosta
829a5b5acf cleaning up 2017-07-15 18:53:01 -04:00
Arian Acosta
112e31a933 polishing last details 2017-07-15 18:47:02 -04:00
Arian Acosta
8af22b5b37 finalizing changes 2017-07-15 18:32:05 -04:00
Arian Acosta
7029118f05 sdfasdf 2017-07-15 17:16:30 -04:00