Commit Graph

229 Commits

Author SHA1 Message Date
larryeitel
07d6ec85ca Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-30 08:40:28 -06:00
Mahmoud Zalt
adfb559521 Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk
expose-port-22-and-add-insecure_id_rsa_ppk
2016-08-30 17:29:51 +03:00
Mahmoud Zalt
05e0e9c817 Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
2016-08-30 11:06:16 +03:00
Mahmoud Zalt
6dcb174012 Merge pull request #266 from bktz/master
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
Mahmoud Zalt
de914d106f Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size
use docker image which only supplies true & echo binaries.
2016-08-30 11:01:33 +03:00
Benjamin Katznelson
1e5d604470 Added support for RabbitMQ 2016-08-28 18:12:55 +10:00
larryeitel
d441427852 Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:22:36 -06:00
larryeitel
227c8da17c Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:00:01 -06:00
Eric Pfeiffer
6ba76da709 use docker image which only supplies true & echo binaries. 2016-08-27 13:18:13 -05:00
Bo-Yi Wu
78be0b577e support specific node version
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 19:38:44 +08:00
Eric Pfeiffer
29d714a849 caddy log to file. enable gzip compression. 2016-08-26 13:26:22 -05:00
Mahmoud Zalt
9fb50b2c6b fix phpmyadmin port. closes #247 2016-08-24 00:43:11 +03:00
Bo-Yi Wu
3c8861d1d2 remove empty data folder for mariadb.
ref:
d969a465ee/10.1/Dockerfile (L83)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:02:21 +08:00
Bo-Yi Wu
2d51548879 support phpmyadmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:01:34 +08:00
Mahmoud Zalt
4aa3902f32 Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh
Install and start workspace ssh
2016-08-22 03:30:17 +03:00
Luciano Gonçalves
1afad7f14c Add configuration to install aerospike php extension 2016-08-20 19:05:38 +01:00
Luciano Gonçalves
9bd70aadc8 Added aerospike cache service 2016-08-20 12:28:45 +01:00
Mahmoud Zalt
e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
larryeitel
4e7e003e87 ssh keys 2016-08-17 19:24:00 -06:00
Tim Bracken
cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Mahmoud Zalt
380c7bd1ec Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock:
  Proof of concept - LaraDock hosting multiple sites
2016-08-16 15:56:19 +03:00
Mahmoud Zalt
b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:13:42 +03:00
Suteepat Damrongyingsupab
a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel
93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
larryeitel
d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Lialosiu
1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Maelle
b7d38ef7dd parameter data in the path 2016-07-28 11:49:42 +02:00
Eric Pfeiffer
5e0e120950 add apache2 container. 2016-07-27 19:35:58 -05:00
Eric Pfeiffer
20adc9ca13 accidentally forgot to set INSTALL_NODE back to false. 2016-07-27 02:56:48 -05:00
Eric Pfeiffer
17e252a436 add non-root user for workspace container. 2016-07-27 02:43:38 -05:00
Mahmoud Zalt
062b7466f6 add composer.json to install global composer dependencies 2016-07-25 07:00:50 +03:00
Mahmoud Zalt
e1dbb972f1 make Mongo, xDebug, Node, and prestissimo Installation Optional
on the Workspace and PHP-FPM Containers

+ general refactoring
2016-07-25 06:25:38 +03:00
Mahmoud Zalt
28a2d8e072 delete the .env file
making the central editing place is the docker-compose.yml file
2016-07-24 23:11:33 +03:00
orette
ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
Eric Pfeiffer
9e7a669d5b incorporate upstream changes. 2016-07-19 22:01:20 -05:00
Eric Pfeiffer
9b084433c3 add caddy server. 2016-07-19 21:51:20 -05:00
Mahmoud Zalt
68576f9022 fix the volumes mapping 2016-07-13 17:04:06 +03:00
Mahmoud Zalt
2df00ecdad remove installing Prestissimo by default, to prevent the warning 2016-07-13 16:00:47 +03:00
Jack Fletcher
dca0545293 Fixed incorrect php-fpm container mapping 2016-07-13 10:44:17 +01:00
Jack Fletcher
5f99478c76 Fixed workspace container mapping volumes to wrong container 2016-07-13 10:08:13 +01: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
42d63236f1 Changed the data container volume mappings
All of the database data volume mapping have been changed from the host's
`/var/lib` directory to locally alongside the laradock installation. This
should hopefully prevent issues where data disappears after containers are
restarted or data on the host machine is overwritten by accident (scary!)

Additionally this should make data easier to backup between installations
- especially on Windows where `/var` does not exist and is created
  transparently by Docker Machine/Windows beta.

This change will most likely cause data to disappear from existing
installations, however it may reappear if moved to it's new home.

References #137, #138
2016-07-12 16:39:08 +01:00
Jack Fletcher
11c65c4a00 Fix variable not set warning
Added an untracked `.env` file to the root directory to prevent the
`WARNING: The INSTALL_PRESTISSIMO variable is not set` message from being
displayed when `docker-compose` is run.

Added section in README for optional features.
2016-07-12 16:27:55 +01:00
Jack Fletcher
bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt
f3eb6a5fc4 Merge branch 'support-mongo'
* support-mongo:
  add Mongo Support to the Readme
  added php-mongodb extension
  simple reformatting
  set the original volume path
  get mongo volum from the data container
  added mongodb driver for php5.5 5.6
  added mongodb image + PHP7 driver

Fix Conflicts in:
	docker-compose.yml
	php-fpm/Dockerfile-55
	php-fpm/Dockerfile-56
	php-fpm/Dockerfile-70
	php-fpm/laravel.ini
2016-06-11 17:29:27 +03:00
Mahmoud Zalt
a8b4b61e28 update the volumes mounting of the DB containers 2016-06-03 01:50:11 +03:00
Mahmoud Zalt
4c06a03ead get mongo volum from the data container 2016-06-01 14:44:10 +03:00
Bo-Yi Wu
99b54c5f7d remove unnecessary data volume of redis.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-01 13:44:41 +08:00
Amin Mkh
9c7054abe2 added mongodb image + PHP7 driver 2016-05-29 14:19:43 +03:00
Amin Mkh
fd4253afb6 Update docker-compose.yml 2016-05-23 22:23:10 +03:00
Mahmoud Zalt
06c4c19a6f replace official neo4j image with tpires/neo4j
because of this wired error
(https://github.com/neo4j/docker-neo4j/issues/33)
2016-05-20 21:21:19 +03:00
Mahmoud Zalt
5c9eb97db5 Support Neo4j DB (beta) 2016-05-20 20:35:10 +03:00
Mahmoud Zalt
01a056dd25 make the workspace container run automatically 2016-05-19 20:49:16 +03:00
Mahmoud Zalt
2c05c87400 update the logs section 2016-05-18 07:56:12 +03:00
Mahmoud Zalt
4d8a798224 Create Application Container to hold App code 2016-05-18 07:13:19 +03:00
Mahmoud Zalt
377f24fe2b keep workspace container alive with tty 2016-05-18 06:28:31 +03:00
Mahmoud Zalt
efd062fd88 fix linking containers to php-fpm instead of php 2016-05-18 02:54:23 +03:00
Mahmoud Zalt
504c9c59d5 Create workspace container
the workspace container is based from Ubuntu 16.04
it includes PHP-CLI 7 - Git - cURL and Vim for now
2016-05-18 02:46:27 +03:00
Mahmoud Zalt
4edf941872 rename php to php-fpm
preparing to add php cli as part of the workspace container
2016-05-18 02:43:23 +03:00
Mahmoud Zalt
405067d4af Separate the PHP versions to multiple dockerfiles
Because there's some difference in installing some libraries
between PHP 5 and PHP 7. There must be multiple php dockerfiles.
For that I created 3 docker files each of a different version,
this will make it easy for the users to switch between the PHP
version by just editing the docker-compose file and not touching
the dockerfiles.
2016-05-14 04:50:47 +03:00
Mahmoud Zalt
7f4e411d3d link containers to PHP 2016-05-14 04:20:20 +03:00
matt
cf89670671 add memcached support 2016-05-12 02:17:39 +01:00
Mahmoud Zalt
12587bc712 Support Beanstalkd and Beanstalkd Console
Closes feature #38
2016-05-09 05:02:15 +03:00
Mahmoud Zalt
81f2602464 Support MariaDB
closes feature #21
2016-05-09 04:23:03 +03:00
Mahmoud Zalt
ecefee4d65 update postgres volume path 2016-05-09 04:20:03 +03:00
Mahmoud Zalt
de8cbb0605 simple updates to docker compose and readme 2016-05-08 15:21:59 +03:00
Mahmoud Zalt
5190da831a remove containers names from docker-compose
to void conflict while scalling using the scale command
2016-05-08 13:39:43 +03:00
Mahmoud Zalt
5d84c6481f revers the dependancies between php and the db
to prevent running all the db engines when php is running
2016-05-07 05:29:48 +03:00
Mahmoud Zalt
26229e150d Merge pull request #35 from benmag/master
link postgres service to php service
2016-05-07 05:14:01 +03:00
Mahmoud Zalt
457c5d4b1b update the readme file
Support selecting your own containers in the docker compose command.
2016-05-07 05:03:07 +03:00
benmag@users.noreply.github.com
cd97ac0aa6 link postgres service to php service 2016-05-07 11:55:00 +10:00
benmag@users.noreply.github.com
5d62ec1e67 Add support for postgres 2016-05-07 11:16:06 +10: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
Mahmoud Zalt
530ffe7433 remove redis restart always from the docker compose file 2016-04-18 12:08:57 +03:00
Mahmoud Zalt
105fce8965 simlify and reduce the usage steps 2016-04-08 11:33:33 +03:00
Mahmoud Zalt
dac12296c6 upgrade to php 5.6 by default
adding `phpnginx` or `php55nginx` will pull PHP 5.5 while `php56nginx`
will pull PHP 5.6
2016-04-04 10:02:21 +03:00
Mahmoud Zalt
62ec36d9dd replace the images versions from the latest to the latest stable version (tag).
to avoid any errors while experimenting on the master branch
2016-04-04 05:33:18 +03:00
Mahmoud Zalt
e572b0b9e7 edit docker-compose.yml variables to support the new LaraDock structure 2016-02-17 17:51:23 +02:00
Mahmoud Zalt
7e49f6708e get rid of the docker directory 2016-02-17 17:48:59 +02:00