Commit Graph
100 Commits
Author SHA1 Message Date
Mahmoud Zalt 6348d032c9 random docs updates 2017-04-24 20:49:25 -04:00
Mahmoud Zalt 24d70ad1e3 upgrade base image for dockerfile 7.1 after adding bcmath 2017-04-22 20:45:53 -04:00
Mahmoud Zalt 1310d633fc update documentation: what is docker 2017-04-22 16:25:25 -04:00
Mahmoud Zalt bccb1a3162 fix typo in nginx site 2017-04-22 15:10:43 -04:00
Mahmoud Zalt 0cf26af724 set default data path to /tmp 2017-04-22 15:05:52 -04:00
Mahmoud Zalt 00ba765d80 Merge branch 'dtunes-master'
* dtunes-master:
  Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
2017-04-22 14:42:09 -04:00
Mahmoud Zalt 481ac821de Merge branch 'master' of https://github.com/dtunes/laradock into dtunes-master
* 'master' of https://github.com/dtunes/laradock:
  Upgrade hugo to 0.20.2 and added uglyurls = true to fix issues we when upgrading from 0.19 to 0.20 recently, also fixed 404 photos*
2017-04-22 14:41:59 -04:00
Mahmoud Zalt 613eb1e51d update documentation file 2017-04-22 14:35:55 -04:00
Mahmoud Zalt 4d1aee0fbe delete the docs folder 2017-04-22 14:08:01 -04:00
Mahmoud Zalt 79101cd8fe update contribution guide 2017-04-22 14:07:50 -04:00
Mahmoud Zalt 0b11b874d2 add php71.ini 2017-04-21 23:51:52 -04:00
Mahmoud Zalt 80991483bc default php to 7.1 2017-04-21 22:37:59 -04:00
Mahmoud Zalt b1c546efc9 update base images version for workspace and php-fpm 2017-04-21 22:37:48 -04:00
Mahmoud ZaltandDiego Antunes e92286c381 more styling for the .env 2017-04-21 10:15:41 +12:00
Mahmoud ZaltandDiego Antunes e022e7163f hopfully making the .env file easier to edit! 2017-04-21 10:15:36 +12:00
Mahmoud ZaltandDiego Antunes bce05e4b59 little cleanup 2017-04-21 10:13:53 +12:00
Mahmoud ZaltandDiego Antunes 4ce1d7f64a upgrade base images for php-fpm and workspace.
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
2017-04-21 10:13:53 +12:00
Mahmoud Zalt 2a7c11a6bf more styling for the .env 2017-04-20 14:34:42 -04:00
Mahmoud Zalt 1a0f978625 hopfully making the .env file easier to edit! 2017-04-20 14:09:57 -04:00
Mahmoud Zalt 3a2845a00d Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Run apt-get update before installing intl extension
2017-04-20 13:55:21 -04:00
Mahmoud Zalt fef6ec86b3 little cleanup 2017-04-20 13:55:09 -04:00
Mahmoud Zalt 4dda815980 upgrade base images for php-fpm and workspace.
These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
2017-04-20 13:45:04 -04:00
Mahmoud Zalt efc23a693d add missing workspace tools to the docs 2017-04-14 21:02:04 -04:00
Mahmoud Zalt 1235304a0d add missing containers to the docs 2017-04-14 20:02:27 -04:00
Mahmoud Zalt 13952f3468 fix docs images url on the site 2017-04-14 17:58:10 -04:00
Mahmoud Zalt 4a88cbc17a add logo and update some texts 2017-04-14 17:46:35 -04:00
Mahmoud Zalt dc71a125c3 testing travis doc generate 2017-04-14 14:55:45 -04:00
Mahmoud Zalt 5d1660567c rename the travis build scrit and update the new doc path 2017-04-14 14:54:47 -04:00
Mahmoud Zalt 57ee5d96a4 travis for docker build and hugo site 2017-04-14 14:52:54 -04:00
Mahmoud Zalt 919e0a75cd Delet the _settings folder from the Documentation 2017-04-14 14:43:28 -04:00
Mahmoud Zalt 43ace2bebe update contrubition docs 2017-04-14 14:37:31 -04:00
Mahmoud Zalt 07ad461e75 fix travis CI integration to generate Hugo Site 2017-04-14 14:30:39 -04:00
Mahmoud Zalt 74efa008da regenerate site 2017-04-14 04:44:50 -04:00
Mahmoud Zalt 5a496bafeb move _guides to the documentation 2017-04-14 04:43:26 -04:00
Mahmoud Zalt 3a7e6e4b1a add travis file to auto generated documentation 2017-04-14 03:55:08 -04:00
Mahmoud Zalt 4fd73ac512 Fix build error in php-fpm containers, after updating the base image 2017-04-14 03:23:19 -04:00
Mahmoud Zalt 747f956d01 update php-fpm base image tags {requires rebuild} 2017-04-14 03:12:00 -04:00
Mahmoud Zalt 86197c9b62 update docs: Improve docker speed on MAC using dinghy 2017-04-09 14:39:25 -04:00
Mahmoud Zalt 09c5ad273c re-position COMPOSE_CONVERT_WINDOWS_PATHS 2017-03-21 10:06:26 -04:00
Mahmoud Zalt 99b8a45f3b Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Fixed path variable for windows users
  fixes up so Yarn is installable again
  align file format
  for file format
  use '`' to quote identifier
  use CREATE USER to define account authentication characteristics
  use CREATE USER to define account authentication characteristics
  Updated project example confs to fit nameing convention used in apache example
  Updated project example confs to not have gitignore issues
  docker-71 file now also works with new env-example setup
  Adding Arg to docker-compose
  Adding MSSQL Support
2017-03-21 10:02:10 -04:00
Mahmoud Zalt 4f416da26b add missing env variable APPLICATION
closes #703
2017-03-21 10:01:37 -04:00
Mahmoud Zalt 9ae6e45dda Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Update docker-compose.yml
  intl support
2017-03-17 02:46:35 -04:00
Mahmoud Zalt 94d88e91c5 add missing steps to the docs 2017-03-17 02:46:19 -04:00
Mahmoud Zalt 6ada2f1b91 nginx samples sites for multiple projects
- add `project-1.conf` and `project-1.conf` to match the docs.
- keep default to work with both multiple and single projects.
- delete the .gitignore.
- update docker-compose and example-env file to match the new settings
- update the docs
- delete `laravel-https.conf` to replace it with documentation instead
2017-03-16 20:53:14 -04:00
Mahmoud Zalt aedc7c8438 edit the docs 2017-03-16 19:28:01 -04:00
Mahmoud Zalt ec4ccb4a20 Move CNAME from the docs to the DOC.. 2017-03-16 18:33:29 -04:00
Mahmoud Zalt de6040a14d move the documentation markdown files outside the generated html folder 2017-03-16 17:44:14 -04:00
Mahmoud Zalt e0e4616ae0 update installation steps in the docs (.env) 2017-03-16 17:03:05 -04:00
Mahmoud Zalt c00fe5d7e0 Merge branch 'multiple-projects-improvement'
* multiple-projects-improvement:
  updated env-example and removed .env.example
  complete missings
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
2017-03-16 16:10:28 -04:00
Mahmoud Zalt 30cf27e011 Fix nginx: [emerg] BIO_new_file("/var/certs/cert1.pem") failed (SSL: error:02001002:system library:fopen:No such file or directory:fopen('/var/certs/cert1.pem','r') error:2006D080:BIO routines:BIO_new_file:no such file) 2017-03-16 15:56:37 -04:00
Mahmoud Zalt dcec8a46a8 replace the links with depends_on in the docker-compose file
closes #636
2017-03-16 15:11:04 -04:00
Mahmoud Zalt faa42d8651 Merge branch 'Mvzundert-multiple_frameworks'
* Mvzundert-multiple_frameworks:
  complete missings
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
2017-03-13 21:03:58 -04:00
Mahmoud Zalt ab1d5bae95 complete missings 2017-03-13 21:03:31 -04:00
Mahmoud Zalt 7f27073a4e Merge branch 'multiple_frameworks' of https://github.com/Mvzundert/laradock into Mvzundert-multiple_frameworks
* 'multiple_frameworks' of https://github.com/Mvzundert/laradock:
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
2017-03-13 19:29:30 -04:00
Mahmoud Zalt 1a80385a48 change some desgins in the docs site 2017-03-10 13:48:13 -05:00
Mahmoud Zalt a37ba5c477 solve the sidebar problem in the docs 2017-02-22 23:08:54 -05:00
Mahmoud Zalt d0c0a13e28 change docs font and add ga 2017-02-22 22:19:03 -05:00
Mahmoud Zalt 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
Mahmoud Zalt ba8f911d64 fix docs colors to match with lara.. 2017-02-22 21:35:05 -05:00
Mahmoud Zalt f5b3c95068 add how to contribute to the docs 2017-02-22 16:17:15 -05:00
Mahmoud Zalt e5fa629a64 update the docs 2017-02-22 15:58:06 -05:00
Mahmoud Zalt 8e8020e8b0 update the readme.md + re-generate the site 2017-02-22 15:31:27 -05:00
Mahmoud Zalt cc22684420 generate the static docs site in the docs root 2017-02-22 15:22:42 -05:00
Mahmoud Zalt eab4f7c88f generate site in public folder 2017-02-22 15:13:04 -05:00
Mahmoud Zalt f91ffcfd20 move the readme.md content to hugo site 2017-02-22 14:59:06 -05:00
Mahmoud Zalt 0ddafaf362 add docs/ to generate github page 2017-02-22 09:31:31 -05:00
Mahmoud Zalt 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
Mahmoud Zalt ee481a2a26 update Improving Docker on Mac Speed Docs 2017-02-21 10:28:02 -05:00
Mahmoud Zalt 8f44a0800b add Keep track of your Laradock changes section to the docs 2017-02-05 11:56:06 -05:00
Mahmoud Zalt c59dea3745 add beanstalkd section and update the readme.md 2017-01-02 20:41:00 -05:00
Mahmoud Zalt 860af556e2 Support bcmath php extention on php-fpm and workspace (base image 1.3)
Probably closes #453
2016-12-21 14:01:51 -05:00
Mahmoud Zalt f732bb283b update the workspace container version 2016-11-03 09:50:21 -04:00
Mahmoud Zalt ca4aeada08 add missing step to the docs 2016-11-03 09:50:10 -04:00
Mahmoud Zalt 4fe15ad5cf update docs 2016-11-01 10:07:21 -04:00
Mahmoud Zalt 146f8ea6f4 rename volumes_source to applications 2016-11-01 10:05:10 -04:00
Mahmoud Zalt 9ab6d8fa15 remove volumes container 2016-11-01 10:03:47 -04:00
Mahmoud Zalt 1b05dfd1e2 replace var/www/laravel with var/www 2016-10-31 21:45:50 -04:00
Mahmoud Zalt f630970151 remove ./databases:/docker-entrypoint-initdb.d until it works 2016-10-31 20:46:02 -04:00
Mahmoud Zalt 66723c0278 update the doc to support multiple projects 2016-10-31 20:30:34 -04:00
Mahmoud Zalt dbee864d44 rename laravel.conf to default and add sample conf 2016-10-31 19:50:30 -04:00
Mahmoud Zalt 739cc31f4c change app mapping directory from www/laravel to www
also add sample to show facilitate setup for multiple sites
2016-10-31 19:49:48 -04:00
Mahmoud Zalt 28130c5907 delete site_a and site_b nginx config samples 2016-10-31 19:31:15 -04:00
Mahmoud Zalt 658d4e7532 add root access section to mysql docs 2016-10-31 19:30:12 -04:00
Mahmoud Zalt 5da4058613 delete the drupal sample nginx config file 2016-10-31 19:28:47 -04:00
Mahmoud Zalt 2ed09f42ca change workspace and php-fpm work directories
making them compatible with multiple projects
2016-10-31 19:28:25 -04:00
Mahmoud Zalt 6ee790c26d Add support for Codeigniter 2016-10-31 12:21:01 -04:00
Mahmoud Zalt f35e5501db downgrade MySQL to 5.6 (stable) 2016-10-14 12:26:11 -04:00
Mahmoud Zalt c7a76dd683 add LaraDock v4 Video link :D 2016-10-10 08:57:52 -04:00
Mahmoud Zalt 781f5ff972 add missing info to the readme 2016-10-10 07:32:01 -04:00
Mahmoud Zalt 5c0e55204e add folder structures to the README 2016-10-10 04:30:15 -04:00
Mahmoud Zalt dd3ab5ade1 add warning to the readme asking people to rebuild their containers 2016-10-10 03:50:44 -04:00
Mahmoud Zalt 2e5d2a743c disable xdebug remote by default 2016-10-09 20:47:08 -04:00
Mahmoud Zalt 5635b47c6f refactor the workspace docker file 2016-10-09 20:27:03 -04:00
Mahmoud Zalt 56f422ade0 replace true parameters by false as the default 2016-10-09 20:05:33 -04:00
Mahmoud Zalt 7ecb712e76 Revert ports fowarding for MySQL and MariaDB
Include production docker compose file
2016-10-09 16:51:18 -04:00
Mahmoud Zalt 2415566230 general updates to the readme 2016-10-09 02:26:50 -04:00
Mahmoud Zalt e9af2a4fb3 Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
  Fix typo in README: Giude -> Guide
  Added laravel cronjob
  Added cron files copying to workspace crontab
  Remove port fowarding for MySQL and MariaDB
  Added NVM binaries in root bashrc
2016-10-06 17:57:18 -04:00
Mahmoud Zalt d0dea21cc5 update readme credits section 2016-10-06 17:55:41 -04:00
Mahmoud Zalt 3725ad4c46 edit readme: adding Admins list 2016-09-27 19:10:20 -04:00
Mahmoud Zalt f1716a2767 update readme, add more awesome contributors 2016-09-15 10:48:20 -04:00