ff39e6045d
Merge branch 'multiple_frameworks' of github.com:Mvzundert/laradock into multiple_frameworks
2017-03-09 09:32:13 +01:00
07ebd5f69b
Fixed merge conflicts when merging upstream with master
2017-03-09 09:30:47 +01:00
0ac0166068
Merge branch 'master' into multiple_frameworks
2017-03-08 11:33:20 +01:00
94c6240586
workaround for 'Xdebug breaks on access to class static property' ( #654 )
...
see https://github.com/docker-library/php/issues/133
2017-03-08 00:15:46 -05:00
178d7e1505
fix selenium ( #655 )
...
see https://github.com/SeleniumHQ/docker-selenium#running-the-images
2017-03-07 23:57:18 -05:00
082a73ee33
Bump NVM script version to 0.33.1 ( #658 )
...
https://github.com/creationix/nvm/releases/tag/v0.33.1
2017-03-07 23:56:35 -05:00
164b699f24
Merge pull request #653 from thorerik/add-minio
...
Add minio container
2017-03-06 09:37:56 -05:00
c63bf5ea07
Revert "Docs updated"
...
This reverts commit d95b52b7db
2017-03-06 10:58:05 +01:00
46fcb9e09c
Fixed php-fpm variables and example
2017-03-06 09:31:11 +01:00
d95b52b7db
Docs updated
2017-03-05 15:07:29 +01:00
a7503ce3f3
Add Minio container
...
Minio is an s3 compatible server written in go.
2017-03-05 15:06:22 +01:00
84b742315a
Update README-zh.md ( #648 )
2017-03-02 16:56:35 +08:00
b45f395996
Removed homestead entirely this time
2017-03-01 08:29:17 +01:00
59dfacee13
Removed homestead entirely this time
2017-03-01 08:17:34 +01:00
a6e0338245
Removed Homestead reference in all DB containers
2017-03-01 08:08:20 +01:00
f610aa63d1
Removed reference to homestead
2017-02-27 15:58:38 +01:00
966a84fa39
Fixed timezone issue in docker-compose.yml
2017-02-27 14:49:43 +01:00
356dc36fd5
Added NGINX from env file and updated env-example
2017-02-27 14:11:16 +01:00
c112fdffc1
Updated PHP-FPM container to accept .env variables
2017-02-27 14:05:47 +01:00
fa9ac1e471
Added workspace from env file and updated env-example
2017-02-27 13:53:40 +01:00
3f13aa4f50
Removed .env file
2017-02-27 12:36:44 +01:00
474504f1d3
Added env-example and adjusted docker-compose yml to support new env file
2017-02-27 12:35:28 +01:00
ca45806aaa
Updated gitignore
2017-02-27 12:34:20 +01:00
9cb902a819
fix php warning in php-fpm: "Unable to load dynamic library aerospike" ( #622 )
...
* fix php warning in php-fpm: "Unable to load dynamic library aerospike"
* fix php warning in php-fpm: "Unable to load dynamic library aerospike"
* simplify solution
* Update Dockerfile-56
* Update Dockerfile-70
2017-02-25 11:11:45 +08:00
89ff840880
Adding DNS Plugins ( #635 )
...
This updates the download URL to include the DNS provider plugins so that we can use letsencrypt on our local environment. One thing to note, the version is not currently available as part of the dynamic download URL so this may need looking at in the future.
2017-02-24 21:55:56 +08:00
df40020eea
xdebugPhpFpm executable ( #631 )
2017-02-23 22:15:14 +08:00
7ca8aef0d0
remove html tag.
2017-02-23 13:39:39 +08:00
a37ba5c477
solve the sidebar problem in the docs
2017-02-22 23:08:54 -05:00
d0c0a13e28
change docs font and add ga
2017-02-22 22:19:03 -05:00
39767cc038
Merge branch 'master' of https://github.com/laradock/laradock
...
* 'master' of https://github.com/laradock/laradock :
update readme text
2017-02-22 21:35:17 -05:00
ba8f911d64
fix docs colors to match with lara..
2017-02-22 21:35:05 -05:00
97c9fbf469
update readme text
2017-02-22 16:45:46 -05:00
f5b3c95068
add how to contribute to the docs
2017-02-22 16:17:15 -05:00
e5fa629a64
update the docs
2017-02-22 15:58:06 -05:00
8e8020e8b0
update the readme.md + re-generate the site
2017-02-22 15:31:27 -05:00
edb32f5dd1
Merge pull request #629 from laradock/new-docs
...
New docs
2017-02-22 15:23:09 -05:00
cc22684420
generate the static docs site in the docs root
2017-02-22 15:22:42 -05:00
eab4f7c88f
generate site in public folder
2017-02-22 15:13:04 -05:00
f91ffcfd20
move the readme.md content to hugo site
2017-02-22 14:59:06 -05:00
b995b3692e
Create CNAME
2017-02-22 09:32:40 -05:00
0ddafaf362
add docs/ to generate github page
2017-02-22 09:31:31 -05:00
86031105be
Merge branch 'master' of https://github.com/laradock/laradock
...
* 'master' of https://github.com/laradock/laradock :
Fix Caddy volumes to persist SSL (#613 )
Fixed memcached for php5.6 (#624 )
2017-02-21 10:28:18 -05:00
ee481a2a26
update Improving Docker on Mac Speed Docs
2017-02-21 10:28:02 -05:00
770a9779ca
Fix Caddy volumes to persist SSL ( #613 )
...
I'm blaming commit 380eef5fd9
2017-02-21 23:26:56 +08:00
cdaa344321
Fixed memcached for php5.6 ( #624 )
...
```
Step 15/32 : RUN if [ ${INSTALL_MEMCACHED} = true ]; then pecl install memcached && docker-php-ext-enable memcached ;fi
---> Running in b43e2e6b07f6
pecl/memcached requires PHP (version >= 7.0.0), installed version is 5.6.24
pecl/memcached can optionally use PHP extension "igbinary" (version >= 2.0)
pecl/memcached can optionally use PHP extension "msgpack" (version >= 2.0)
No valid packages found
install failed
ERROR: Service 'php-fpm' failed to build: The command '/bin/sh -c if [ ${INSTALL_MEMCACHED} = true ]; then pecl install memcached && docker-php-ext-enable memcached ;fi' returned a non-zero code: 1
```
2017-02-21 23:23:30 +08:00
6440ca841a
change application source #397 ( #609 )
...
# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.
2017-02-15 09:34:30 -05:00
fac84cd45b
Add a config file for mariaDB ( #605 )
2017-02-11 10:51:10 +08:00
21a83bd5a3
safer opcache settings ( #604 )
2017-02-10 15:37:03 -05:00
f333982598
instruction to improve d4m speed ( #597 )
...
* instruction to improve d4m speed
* Move mac speed doc to misc section, remove docker-sync instructions
2017-02-10 08:11:24 -05:00
00550d328c
Various readme typo fixes/improvements ( #593 )
...
* Various readme typo fixes/improvements
* Change Laradock -> LaraDock
2017-02-08 18:45:48 +08:00
