ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,313 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

1313 Commits

Author SHA1 Message Date
ZeroC0D3 Team 3796f9f70a Add network setup in Jenkins container 2017-05-08 06:20:43 +07:00
wxb 31d21c74a0 add swoole extension config 2017-05-08 01:42:46 +08:00
Winfried c6245fdaf8 Merge pull request #908 from bestlong/fix-hugo-rm-fail 
Fixing Travis-CI hugo doc build failed
 2017-05-07 18:47:56 +02:00
Shao Yu Lung c539c630ed fix hugo doc build failed 2017-05-08 00:00:19 +08:00
Winfried a414e5434f Adding system distro/version to issue template 2017-05-07 17:58:44 +02:00
Winfried 08b35e63d6 Merge pull request #905 from winfried-van-loon/docs-update 
Docs update
 2017-05-07 17:39:47 +02:00
Winfried 1598868445 Merge pull request #906 from winfried-van-loon/855-fix-aerospike 
Fixing Aerospike
 2017-05-07 17:39:34 +02:00
Winfried 3134221445 Fixing aerospike 2017-05-07 16:56:15 +02:00
Winfried 4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Winfried 3a3e58de4c Merge branch 'Lednerb-fix-workspace-user-laradock-env' 2017-05-07 15:25:30 +02:00
Winfried 26ecb09685 Merge branch 'fix-workspace-user-laradock-env' of git://github.com/Lednerb/laradock into Lednerb-fix-workspace-user-laradock-env 
# Conflicts:
#	workspace/Dockerfile-56
#	workspace/Dockerfile-70
#	workspace/Dockerfile-71
 2017-05-07 15:24:57 +02:00
Winfried 6db5bc0162 Removing unfinished sentence 2017-05-07 15:18:26 +02:00
Winfried eab859fe80 Adding Docker-sync documenation #612 
Closes #612
 2017-05-07 15:18:09 +02:00
Winfried 1d6c369c06 Adding Docker version recommendation #895 2017-05-07 15:17:25 +02:00
Winfried 05faf24582 Merge pull request #903 from bestlong/less-log-info 
Less log info
 2017-05-07 13:01:53 +02:00
Sascha Brendel e454d1c8a7
Fixed broken adoption for PUID and PGID for Non-Root User laradock. 2017-05-07 12:43:20 +02:00
Shao Yu Lung f162864e89 apt-get update just need run at first, after add-apt-repository or update apt source list. 2017-05-07 01:17:35 +08:00
Shao Yu Lung 69c9202304 apt-get update just need run at first, after add-apt-repository or update apt source list. 2017-05-07 01:08:56 +08:00
Winfried 100a2eb4ae Merge pull request #901 from bestlong/split-ci-build-job-each-service 
Split Travis-CI build jobs and fix php-fpm mssql
 2017-05-06 16:56:58 +02:00
Shao Yu Lung 59293d7a99 set php-fpm and workspace use sam sqlsrv version. 2017-05-06 18:48:44 +08:00
Shao Yu Lung 02958c06fe php-fpm Dockerfile-71 MYSQL 
* remove old section
* fill new section
 2017-05-06 17:44:32 +08:00
Shao Yu Lung a6e2a6ee59 php-fpm Dockerfile-70 MYSQL 
install stable version
 2017-05-06 17:44:32 +08:00
Shao Yu Lung cf30e159fb php-fpm Dockerfile-70 
fix ini file path
 2017-05-06 17:44:32 +08:00
Shao Yu Lung 9f12f63aea php-fpm Dockerfile-70 
remove duplicate MSSQL section.
 2017-05-06 17:44:31 +08:00
Shao Yu Lung e8aad1238e join short time jobs 2017-05-06 17:37:03 +08:00
Shao Yu Lung 6843f508fa join short time jobs 2017-05-06 17:08:10 +08:00
Shao Yu Lung 3b0e4cd05d join short time jobs 2017-05-06 16:02:23 +08:00
Shao Yu Lung e8b49a9fe5 split build jobs 2017-05-06 15:13:18 +08:00
Winfried 15d7cd1d35 Merge pull request #897 from bestlong/update-aerospike-client-php-version 
Upgrade `aerospike-client-php` version to 3.4.14
 2017-05-05 14:02:49 +02:00
Winfried 61f74b5307 Updating issue template, checkmarks are tasks 2017-05-05 13:29:14 +02:00
Shao Yu Lung a81686d9d0 aerospike-client-php version to 3.4.14 (php-fpm) 2017-05-05 19:13:10 +08:00
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