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
6db5bc0162
Removing unfinished sentence
2017-05-07 15:18:26 +02:00
eab859fe80
Adding Docker-sync documenation #612
...
Closes #612
2017-05-07 15:18:09 +02:00
1d6c369c06
Adding Docker version recommendation #895
2017-05-07 15:17:25 +02:00
05faf24582
Merge pull request #903 from bestlong/less-log-info
...
Less log info
2017-05-07 13:01:53 +02:00
e454d1c8a7
Fixed broken adoption for PUID and PGID for Non-Root User laradock.
2017-05-07 12:43:20 +02:00
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
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
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
59293d7a99
set php-fpm and workspace use sam sqlsrv version.
2017-05-06 18:48:44 +08:00
02958c06fe
php-fpm Dockerfile-71 MYSQL
...
* remove old section
* fill new section
2017-05-06 17:44:32 +08:00
a6e2a6ee59
php-fpm Dockerfile-70 MYSQL
...
install stable version
2017-05-06 17:44:32 +08:00
cf30e159fb
php-fpm Dockerfile-70
...
fix ini file path
2017-05-06 17:44:32 +08:00
9f12f63aea
php-fpm Dockerfile-70
...
remove duplicate MSSQL section.
2017-05-06 17:44:31 +08:00
e8aad1238e
join short time jobs
2017-05-06 17:37:03 +08:00
6843f508fa
join short time jobs
2017-05-06 17:08:10 +08:00
3b0e4cd05d
join short time jobs
2017-05-06 16:02:23 +08:00
e8b49a9fe5
split build jobs
2017-05-06 15:13:18 +08:00
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
61f74b5307
Updating issue template, checkmarks are tasks
2017-05-05 13:29:14 +02:00
a81686d9d0
aerospike-client-php version to 3.4.14 (php-fpm)
2017-05-05 19:13:10 +08:00
2f010506eb
aerospike-client-php version to 3.4.14
2017-05-05 18:21:45 +08:00
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
7f7d8839eb
Merge pull request #896 from bestlong/fix-mssql
...
workspace/Dockerfile-71 fill missing MSSQL section
2017-05-05 07:35:22 +02:00
e579b18794
workspace/Dockerfile-70 duplicate MSSQL section.
2017-05-05 13:07:56 +08:00
fde406bafa
Dockerfile-71 fill missing MSSQL section
2017-05-05 12:33:09 +08:00
4cb440504b
git clone only need one depth.
2017-05-04 17:41:02 +08:00
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
61aabf664e
fixing CI build failed
2017-05-04 16:15:28 +08:00
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
61168cb9d3
Merge pull request #887 from winfried-van-loon/792-v8js
...
Fixing V8JS
2017-05-04 08:49:26 +02:00
da58d2e9b9
Fixing V8JS
...
Fixes #792
2017-05-03 23:33:52 +02:00
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
623d7aa58d
added MS SQL support to workspace
2017-05-03 13:27:24 -04:00
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
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
ca198b85bf
Added support for MS SQL server driver for PHP 7.0
2017-05-03 13:01:03 -04:00
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
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
bedb663a8e
use CI build config set to update PHP_VERSION in .env
2017-05-03 18:56:01 +08:00
5a5dceb967
Merge pull request #883 from laradock/843-sqlsrv-php71
...
Add sqlsrv to php-fpm php71
2017-05-02 15:29:45 +02:00
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
06b9dd3327
Merge pull request #884 from shahzeb1/master
...
Created a helpful issues template.
2017-05-02 15:28:48 +02:00
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
767fbddde9
Added where to place the x
2017-05-01 21:01:57 -07:00
3e63afb907
Fixed heading sizes
2017-05-01 20:58:56 -07:00
f6fe749da3
Added a template for issues
2017-05-01 20:58:11 -07:00
e5fbc623eb
Helpful template for issues added
2017-05-01 20:56:25 -07:00
02a512dd72
Dockerfile minor formatting
2017-05-01 22:20:25 +02:00
d5883e4bcf
Adding sqlsrv to php-fpm PHP71
2017-05-01 22:19:09 +02:00
