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
da58d2e9b9
Fixing V8JS
...
Fixes #792
2017-05-03 23:33:52 +02: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
9413f2c86f
Reverting unintended MD formatting
2017-05-01 21:00:32 +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
080fffba3d
Merge branch 'master' into 849-apache-webroot
...
# Conflicts:
# DOCUMENTATION/content/getting-started/index.md
2017-04-28 21:14:39 +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
Winfried
ad00284a22
Removing ext enable aerospike error
2017-04-12 00:35:11 +02:00
Winfried
a835c9e709
Fixing soap already loaded warning in workspace
2017-04-12 00:28:54 +02:00
Winfried
cdb456a9b5
Fixing indentation
2017-04-11 23:19:58 +02:00
Winfried
714902d12a
Moving php-fpm xdebug config to proper location
2017-04-11 23:17:21 +02:00
Winfried
657d8535a6
Fixing not-consumed buildargs php-fpm-56
...
Should fix the following warning:
```
[Warning] One or more build-args [INSTALL_INTL INSTALL_PHPREDIS INSTALL_GHOSTSCRIPT] were not consumed
```
2017-04-11 23:15:09 +02:00
Winfried
0594681760
Fixing the php ext already loaded warnings
...
Example:
```
warning: exif (exif.so) is already loaded!
```
2017-04-11 23:10:41 +02:00
Winfried
e10217c64d
Fixing ghostscript env option
...
Forgot something :(.
2017-04-11 21:52:34 +02:00
Winfried
f91def64d7
Fixing whitespaces and tailing spaces
2017-04-11 21:22:57 +02:00
Winfried
86ebbfbdd3
Adding exif/redis to php-fpm 56 and 71
2017-04-11 20:48:42 +02:00
Winfried
7dbe65e5f8
Bringing Dockerfile 71 up-to-date with 70
2017-04-11 16:47:38 +02:00
Winfried
ef38dd1532
Fixing ghostscript env option
2017-04-11 16:45:20 +02:00
Winfried
4b91fb1212
Fixing INTL ext in php-fpm for php71
2017-04-11 16:42:27 +02:00
Winfried
80a60d58cf
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:22:07 +02:00
Winfried
02e867c17d
Adding log directories to prevent errors
2017-04-09 21:58:05 +02:00
Winfried
f99eff3a99
Updating env to switch workspace php version. #714
2017-04-04 23:39:03 +02:00
Winfried
ff4b913396
Simplifying PHP_FPM version. #724
2017-04-04 23:14:04 +02:00
Winfried
e861348475
Adding option to install Php5.x MySQL #722
2017-04-04 16:39:53 +02:00
Winfried
37dee56bb7
Fixing MariaDB root password variable. #736
2017-04-04 00:05:44 +02:00