Commit Graph

20 Commits

Author SHA1 Message Date
Shao Yu-Lung (Allen) 55e2c6472e
Merge branch 'master' into develop 2021-03-23 20:33:45 +08:00
Laércio de Sousa 23a1aaa8b0
Add support for custom docker-compose.yml
For some reason, one may want/need to edit laradock's default file `docker-compose.yml` e.g. srtipping out uneeded services, so that the whole project can be brought up with a simple `docker-compose up` command. With this commit, the user can copy default `docker-compose.yml` as `docker-compose.custom.yml` and make the desired changes there. This file will not be tracked by Git.
2020-07-03 16:17:17 -03:00
Miguel Ortiz aec544961c
Merge branch 'master' into develop 2019-12-26 11:55:09 -05:00
Laércio de Sousa 88d06bb838 Complete sample configuration for VSCode Remote Development on Containers 2019-12-06 13:50:32 -03:00
Miguel Ortiz 6b96891e47
Merge branch 'master' into develop 2019-11-07 14:53:27 -05:00
Laércio de Sousa b7b468765a Add sample configuration for Visual Studio Code Remote Development on Containers. 2019-10-08 09:39:30 -03:00
Miguel Ortiz a0365437c5 Apache2 certificate location settings 2019-09-23 20:03:43 -05:00
蔡正海 fbdfc41927 feat: Add PHP_FPM_INSTALL_XHPROF as an option to install xhprof extension (#2077)
* feat: Add PHP_FPM_INSTALL_XHPROF as an option to install xhprof extension
* fix: INSTALL_XHPROF default value set false
2019-05-18 10:57:01 +08:00
Andrew Siegman 7430a34dd5 Add logstash support (#1852)
* add logstash support
2019-02-09 16:40:14 +08:00
Vladyslav Shchepotin d03ead34a2 Nginx for Windows (#1879)
* feature(nginx): add OpenSSL
* feature(nginx): add volume to store the certificates
* feature(nginx): add option installation OpenSSL
* feature(nginx): autogenerate certificates
* chore(nginx): add new line at end of file
* fix(nginx): fix run nginx on Windows
* fix(gitignore): end of file
2019-01-08 15:24:32 +08:00
Mahmoud Zalt d4f9b04467 ignore `/jenkins/jenkins_home/` generated files 2017-12-20 01:09:47 +01:00
Arian Acosta 00a38fe274 added docker-sync support 2017-07-14 17:03:01 -04:00
ZeroC0D3 Team 2219177eac Merge branch 'master' into master 2017-03-17 14:54:06 +07:00
ZeroC0D3 Team f5e33fb396 Update .gitignore file 2017-03-17 13:49:21 +07:00
Marius van Zundert ca45806aaa Updated gitignore 2017-02-27 12:34:20 +01:00
Edmund Luong b569765f82 Add .env file for converting Windows paths to resolve issues with Docker Compose in Docker Toolbox (#531) 2017-01-07 11:35:59 -05:00
larryeitel 93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
Jack Fletcher 14cbe9f935 Moved volume container definitions
I've placed the `application` and `data` directories into a `volumes`
subdirectory. The top level `data` directory is now used for storing the
data used by the database (and other, if any) containers. The `data`
directory has also been added to the `.gitignore` file to prevent
accidental pushing of user data.
2016-07-12 17:11:57 +01:00
Jack Fletcher bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt 05a83d383f Major updates.
- upgrade docker compose to v2
- build images locally instead of pulling them from the registry
- separate php container form nginx container
- support all the php versions including php 7.0
- remove beanstalked container to be optionally added later by the user
2016-05-06 17:04:02 +03:00