Commit Graph

2892 Commits

Author SHA1 Message Date
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
Winfried
7f7d8839eb Merge pull request #896 from bestlong/fix-mssql
workspace/Dockerfile-71 fill missing MSSQL section
2017-05-05 07:35:22 +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
Shao Yu Lung
4cb440504b git clone only need one depth. 2017-05-04 17:41:02 +08:00
Winfried
aa5e8e6666 Merge pull request #890 from bestlong/fix-ci-build-fail-php56
Fixed Travis CI build failed for PHP_VERSION=56
2017-05-04 10:46:49 +02:00
Shao Yu Lung
61aabf664e fixing CI build failed 2017-05-04 16:15:28 +08:00
Tristan Bailey
c31e002064 Update Redis Docker File
The dir for the conf seems to be missing from the base image, so the copy fails

Also if the server does not start with the conf as parameter it will not pick it up. Which leaves Redis wide open to attack by default:

Example try to telnet to your ip on the redis port for this container:   
telnet 192.168.1.11 6379  
echo "Hey no AUTH required!"
2017-05-04 08:22:32 +01:00
Winfried
61168cb9d3 Merge pull request #887 from winfried-van-loon/792-v8js
Fixing V8JS
2017-05-04 08:49:26 +02:00
Winfried
da58d2e9b9 Fixing V8JS
Fixes #792
2017-05-03 23:33:52 +02:00
Winfried
57616901fd Merge pull request #873 from markhilton/master
Added support for MS SQL server driver for PHP 7.0
2017-05-03 22:52:42 +02:00
Mark Hilton
623d7aa58d added MS SQL support to workspace 2017-05-03 13:27:24 -04:00
Mark Hilton
2710723d88 Merge branch 'master' of github.com:markhilton/laradock
* 'master' of github.com:markhilton/laradock:
  Added support for MS SQL server driver for PHP 7.0 - requested changes: - removed cd / && \ - added INSTALL_MSSQL to docker-compose.yml and env-example
  Added support for MS SQL server driver for PHP 7.0
2017-05-03 13:01:51 -04:00
Mark Hilton
e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 13:01:03 -04:00
Mark Hilton
ca198b85bf Added support for MS SQL server driver for PHP 7.0 2017-05-03 13:01:03 -04:00
Mark Hilton
f339c3f055 Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 12:59:44 -04:00
Winfried
207cb2929a Merge pull request #885 from bestlong/ci-env-php-version-forget-change
Fix CI build forget update PHP_VERSION in .env
2017-05-03 13:21:18 +02:00
Shao Yu Lung
bedb663a8e use CI build config set to update PHP_VERSION in .env 2017-05-03 18:56:01 +08:00
Winfried
5a5dceb967 Merge pull request #883 from laradock/843-sqlsrv-php71
Add sqlsrv to php-fpm php71
2017-05-02 15:29:45 +02:00
Winfried
369fbded81 Merge pull request #882 from winfried-van-loon/843-sqlsrv-version
Upgrading sqlsrv to version without error
2017-05-02 15:29:26 +02:00
Winfried
06b9dd3327 Merge pull request #884 from shahzeb1/master
Created a helpful issues template.
2017-05-02 15:28:48 +02:00
Winfried
b9b9d52e57 Merge pull request #877 from bestlong/876-ci-not-fail-when-build-error
fixing Travis-CI build problem
2017-05-02 06:14:41 +02:00
shahzeb1
767fbddde9 Added where to place the x 2017-05-01 21:01:57 -07:00
shahzeb1
3e63afb907 Fixed heading sizes 2017-05-01 20:58:56 -07:00
shahzeb1
f6fe749da3 Added a template for issues 2017-05-01 20:58:11 -07:00
shahzeb1
e5fbc623eb Helpful template for issues added 2017-05-01 20:56:25 -07:00
Winfried
02a512dd72 Dockerfile minor formatting 2017-05-01 22:20:25 +02:00
Winfried
d5883e4bcf Adding sqlsrv to php-fpm PHP71 2017-05-01 22:19:09 +02:00
Winfried
5815549a9a Upgrading sqlsrv to version without error 2017-05-01 22:17:29 +02:00
Winfried
b2821b85ab Merge pull request #881 from winfried-van-loon/revert-unintended-md-formatting
Reverting unintended MD formatting
2017-05-01 21:11:57 +02:00
Winfried
9413f2c86f Reverting unintended MD formatting 2017-05-01 21:00:32 +02:00
Winfried
47150da482 Merge pull request #880 from laradock/878-webroot
Fixing webroot issues (public folder)
2017-05-01 16:43:30 +02:00
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