Winfried
1e6ee4a7b5
Merge pull request #879 from winfried-van-loon/864-870-merging-workspace-dockerfiles
...
Merging workspace Dockerfiles
2017-05-01 16:43:12 +02:00
Winfried
1be9df7d61
Fixing apache webroot issue #849
2017-05-01 12:41:55 +02:00
Winfried
8246863cd7
Partly reverting 690137a3
2017-05-01 12:36:31 +02:00
Winfried
5291f0f884
Merging workspace Dockerfiles
...
Should fix #864 and #870
2017-05-01 07:19:13 +02:00
Winfried
d44873085b
Merge pull request #850 from winfried-van-loon/849-apache-webroot
...
Updating webroots to have the same defaults
2017-04-30 18:46:57 +02:00
Shao Yu Lung
956b9209bf
fixing ci build problem
2017-04-30 21:52:22 +08:00
Winfried
080fffba3d
Merge branch 'master' into 849-apache-webroot
...
# Conflicts:
# DOCUMENTATION/content/getting-started/index.md
2017-04-28 21:14:39 +02:00
Winfried
fd47c89736
Merge pull request #874 from geekpobre/patch-1
...
Fix image path on doc guides
2017-04-28 08:37:42 +02:00
Bruno Briante
ae72b00e29
Fix image path on doc guides
...
The guides page was showing broken images as the url for those was not taking into consideration the url rewrite. I just added a slash in front of all those urls to serve them from root images folder instead.
2017-04-28 03:24:06 -03:00
Mark Hilton
74ba0ef0a8
Added support for MS SQL server driver for PHP 7.0
2017-04-27 13:58:27 -04:00
Mike Erickson
db353fbbdc
Merge pull request #854 from winfried-van-loon/792-V8JS-typo
...
Fixing typo in the workspace V8 args
2017-04-27 08:40:13 -07:00
Mike Erickson
f6f89fca61
Merge pull request #857 from winfried-van-loon/847-fix-intl-php-fpm
...
Add apt update to intl install
2017-04-27 08:39:48 -07:00
Mike Erickson
c979878288
Merge pull request #858 from winfried-van-loon/828-phpmyadmin-adminer-port
...
Changing PMA/adminer default port to 8080
2017-04-27 08:39:29 -07:00
Mike Erickson
68ef6235c1
Merge pull request #859 from winfried-van-loon/813-adminer-pg-login
...
Locking Adminer to stable version
2017-04-27 08:38:57 -07:00
Mike Erickson
a94b4e259c
Merge pull request #860 from winfried-van-loon/workspace-latest-base-image
...
Updating workspace to use latest base image
2017-04-27 08:38:41 -07:00
Mike Erickson
988750e737
Merge pull request #867 from lincome/master
...
cp env-example .env
2017-04-27 08:38:01 -07:00
lincome
c7a726cd59
Laravel 项目
2017-04-27 15:05:35 +08:00
Mahmoud Zalt
6348d032c9
random docs updates
2017-04-24 20:49:25 -04:00
Thor Erik
6bf9ac877b
Merge pull request #856 from winfried-van-loon/748-workspace-soap
...
Fixing soap being loaded twice
2017-04-24 10:34:41 +02:00
Winfried
dde95043f8
Updating workspace to use latest base image
2017-04-24 00:07:07 +02:00
Winfried
4bf0df8ee1
Locking Adminer to stable version
2017-04-23 23:57:47 +02:00
Winfried
1db18b1cec
Changing PMA/adminer default port to 8080
...
Fixes issue #828
2017-04-23 23:40:27 +02:00
Winfried
c6bd305b13
Fixing soap being loaded twice
2017-04-23 23:19:56 +02:00
Winfried
49f245b37a
Add apt update to intl intall
...
Fixes #847
2017-04-23 21:29:18 +02:00
Winfried
ef6071bff0
Fixing typo in the workspace V8 args
2017-04-23 21:16:58 +02:00
Winfried
690137a349
Changing docroots to have the same defaults
...
Caddy, NGINX and Apache2 should have the same default application paths. The `public/` path suffix is now added in the dotenv file to be able to use Laradock for non-laravel projects as well. Also, updated the documentation.
2017-04-23 20:44:18 +02:00
Mahmoud Zalt
24d70ad1e3
upgrade base image for dockerfile 7.1 after adding bcmath
2017-04-22 20:45:53 -04:00
Mahmoud Zalt
1310d633fc
update documentation: what is docker
2017-04-22 16:25:25 -04:00
Mahmoud Zalt
bccb1a3162
fix typo in nginx site
2017-04-22 15:10:43 -04:00
Mahmoud Zalt
0cf26af724
set default data path to /tmp
2017-04-22 15:05:52 -04:00
Mahmoud Zalt
00ba765d80
Merge branch 'dtunes-master'
...
* dtunes-master:
Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
2017-04-22 14:42:09 -04:00
Mahmoud Zalt
481ac821de
Merge branch 'master' of https://github.com/dtunes/laradock into dtunes-master
...
* 'master' of https://github.com/dtunes/laradock :
Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
2017-04-22 14:41:59 -04:00
Mahmoud Zalt
613eb1e51d
update documentation file
2017-04-22 14:35:55 -04:00
Mahmoud Zalt
4d1aee0fbe
delete the docs folder
2017-04-22 14:08:01 -04:00
Mahmoud Zalt
79101cd8fe
update contribution guide
2017-04-22 14:07:50 -04:00
zuohuadong
eefd04dbfc
add pg_dump
2017-04-22 13:54:19 +08:00
zuohuadong
a657dce572
Merge pull request #3 from laradock/master
...
update
2017-04-22 13:49:39 +08:00
Mahmoud Zalt
c1a2f4b2a8
Merge pull request #844 from zuohuadong/master
...
Fix git's BUG & add plugin
2017-04-21 23:53:25 -04:00
Mahmoud Zalt
0b11b874d2
add php71.ini
2017-04-21 23:51:52 -04:00
Mahmoud Zalt
80991483bc
default php to 7.1
2017-04-21 22:37:59 -04:00
Mahmoud Zalt
b1c546efc9
update base images version for workspace and php-fpm
2017-04-21 22:37:48 -04:00
zuohuadong
f714954033
Fix git's BUG & add plugin
...
1. Repair git can not synchronize the BUG.
2. Increase the CDN query real IP, cross-domain request plugin.
you can use git xxx.com to sync code in caddy.
2017-04-22 10:19:31 +08:00
zuohuadong
7614b1f626
Merge pull request #2 from laradock/master
...
update
2017-04-22 10:11:55 +08:00
Mahmoud Zalt
a44cae4408
Merge pull request #841 from zuohuadong/master
...
update cadddy version to 0.10.0
2017-04-21 13:48:07 -04:00
zuohuadong
bdc6ea851f
update caddy to 0.10.0
2017-04-21 14:37:51 +08:00
zuohuadong
a5adf85e2d
Merge pull request #1 from laradock/master
...
更新到最新
2017-04-21 14:35:15 +08:00
Diego Antunes
7f540ed7e2
Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
2017-04-21 11:56:59 +12:00
Mahmoud Zalt
0f7b6bab6b
Merge pull request #836 from dtunes/feature_blackfire_container
...
Feature blackfire container
2017-04-20 19:11:58 -04:00
dtunes
39f0eaf328
Merge branch 'master' into feature_blackfire_container
2017-04-21 10:30:45 +12:00
Mahmoud Zalt
e92286c381
more styling for the .env
2017-04-21 10:15:41 +12:00
