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
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
Mahmoud Zalt
e022e7163f
hopfully making the .env file easier to edit!
2017-04-21 10:15:36 +12:00
Bojan Bedrac
5c95bb3a0f
Run apt-get update before installing intl extension
2017-04-21 10:13:53 +12:00
Mahmoud Zalt
bce05e4b59
little cleanup
2017-04-21 10:13:53 +12:00
Mahmoud Zalt
4ce1d7f64a
upgrade base images for php-fpm and workspace.
...
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
2017-04-21 10:13:53 +12:00
Shao Yu Lung
d0effd9468
Fixing Unable to connect to postgresql server
2017-04-21 10:13:53 +12:00
Diego Antunes
5aab3add44
Added blackfire.io
2017-04-21 10:02:54 +12:00
Mahmoud Zalt
2a7c11a6bf
more styling for the .env
2017-04-20 14:34:42 -04:00
Mahmoud Zalt
1a0f978625
hopfully making the .env file easier to edit!
2017-04-20 14:09:57 -04:00
Mahmoud Zalt
3a2845a00d
Merge branch 'master' of https://github.com/Laradock/laradock
...
* 'master' of https://github.com/Laradock/laradock :
Run apt-get update before installing intl extension
2017-04-20 13:55:21 -04:00
Mahmoud Zalt
fef6ec86b3
little cleanup
2017-04-20 13:55:09 -04:00
Mahmoud Zalt
c5105c29b6
Merge pull request #834 from xbojch/libicu-dev-not-found
...
Run apt-get update before installing intl extension
2017-04-20 13:46:02 -04:00
Mahmoud Zalt
4dda815980
upgrade base images for php-fpm and workspace.
...
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
2017-04-20 13:45:04 -04:00
Mahmoud Zalt
a6ff3d0666
Merge pull request #831 from bestlong/fix-pgadmin-host-name-not-resolve
...
Fixing Unable to connect to postgresql server
2017-04-20 13:14:52 -04:00
Shao Yu Lung
0549936547
Fixing Unable to connect to postgresql server
2017-04-20 20:25:14 +08:00
Bojan Bedrac
407353e6eb
Run apt-get update before installing intl extension
2017-04-20 13:46:38 +02:00
Diego Antunes
a7624a7034
Merge branch 'master' of https://github.com/laradock/laradock
2017-04-20 08:41:50 +12:00
Mahmoud Zalt
f30e36bc93
Merge pull request #825 from bestlong/install-all-ext-for-ci-build
...
Install all ext to run CI build.
2017-04-18 11:32:51 -04:00
Mahmoud Zalt
b9716e7fef
Merge pull request #821 from computerfr33k/master
...
Revert to Hugo v0.19
2017-04-18 11:30:53 -04:00
Shao Yu Lung
cc520c18b5
Install all ext to run CI build.
2017-04-18 15:07:27 +08:00
Yu-Lung Shao (Allen)
c67fa5b258
Fixing could not resolve host: elasticsearch ( #823 )
2017-04-18 12:23:44 +08:00
dtunes
3d6b6ba271
Included Percona in the docs ( #820 )
2017-04-18 12:17:39 +08:00
Yu-Lung Shao (Allen)
677b9170ca
Fixing type and markdown syntax. ( #822 )
2017-04-18 12:16:22 +08:00
Eric Pfeiffer
92511ab8a8
Revert to Hugo v0.19
...
v0.20 is not working properly with the current site.
2017-04-17 20:03:57 -05:00
Diego Antunes
393d20472a
Included Percona in the docs
2017-04-18 12:14:26 +12:00
Mahmoud Zalt
5b9dd242f3
Merge pull request #819 from dtunes/master
...
Added percona container
2017-04-17 19:52:04 -04:00
Diego Antunes
a91bd19739
Merge branch 'master' of https://github.com/laradock/laradock
2017-04-18 10:27:37 +12:00
Diego Antunes
ba32dedbef
Added Percona container as an alternative to mysql mariadb
2017-04-18 10:19:09 +12:00
Mahmoud Zalt
df87c3e36b
Merge pull request #817 from laradock/winfried-van-loon-patch-1
...
Fixing typo in docs menu
2017-04-17 17:16:26 -04:00
Winfried
425d344e97
Fixing typo in docs menu
2017-04-17 18:37:01 +02:00
Mahmoud Zalt
73ebc1effa
Merge pull request #815 from bestlong/fix-adminer-login-fail
...
Fixing Adminer can’t login
2017-04-17 11:22:50 -04:00
Mahmoud Zalt
bb8bf6ae10
Merge pull request #812 from bestlong/add-travis-ci-build-status-image
...
Add Travis CI status image.
2017-04-17 11:22:33 -04:00
Shao Yu Lung
5f3e0a9109
Fixing Adminer can’t login
2017-04-17 13:40:30 +08:00
Shao Yu Lung
f7090a47a4
Add Travis CI status image.
2017-04-17 10:48:07 +08:00
Mahmoud Zalt
8ffb0ff3e3
Merge pull request #810 from wxb/master
...
set data save path(mysql/redis/memcached..)
2017-04-16 11:51:32 -04:00
wxb
f14b3b32cf
add php.ini file
2017-04-16 19:33:27 +08:00
wxb
3a8bd8a015
add data save path(mysql/redis/memcached..)
2017-04-16 19:08:03 +08:00
Mahmoud Zalt
efc23a693d
add missing workspace tools to the docs
2017-04-14 21:02:04 -04:00
Mahmoud Zalt
1235304a0d
add missing containers to the docs
2017-04-14 20:02:27 -04:00
Mahmoud Zalt
13952f3468
fix docs images url on the site
2017-04-14 17:58:10 -04:00
Mahmoud Zalt
4a88cbc17a
add logo and update some texts
2017-04-14 17:46:35 -04:00
Mahmoud Zalt
dc71a125c3
testing travis doc generate
2017-04-14 14:55:45 -04:00
Mahmoud Zalt
5d1660567c
rename the travis build scrit and update the new doc path
2017-04-14 14:54:47 -04:00
Mahmoud Zalt
57ee5d96a4
travis for docker build and hugo site
2017-04-14 14:52:54 -04:00