Compare commits

...

236 Commits

Author SHA1 Message Date
537f2c5033 Merge pull request #198 from computerfr33k/master
minimize user switching in workspace build.
2016-07-29 18:24:03 +03:00
f36f9ef6ec minimize user switching in build. 2016-07-29 10:16:06 -05:00
605c191717 add more info for upgrading docker in the reamdme 2016-07-29 14:53:25 +03:00
f2615b9ff2 Merge pull request #194 from Kauhat/fix-composer
Fix user permissions issue when installing Composer in the workspace container
2016-07-29 14:01:48 +03:00
04174b476c Merge pull request #196 from LaraDock/LaraDock-Native
LaraDock Native (For Mac/Windows)
2016-07-29 13:55:23 +03:00
afac432b2f upgrade readme to docker native 2016-07-29 13:52:16 +03:00
2f156edafd Fix syntax error in the beanstalkd-console dockerfile 2016-07-29 13:19:44 +03:00
42d551dead Fix user permissions issue when installing Composer in the workspace
container
2016-07-29 09:59:38 +01:00
b7d38ef7dd parameter data in the path 2016-07-28 11:49:42 +02:00
c5ac8d1ada add apache to the readme 2016-07-28 08:08:41 +03:00
2f20216d8f Merge pull request #189 from computerfr33k/apache2
Add Apache2 Container
2016-07-28 07:38:41 +03:00
5e0e120950 add apache2 container. 2016-07-27 19:35:58 -05:00
33b701afdc Merge pull request #188 from computerfr33k/workspace-user
Use workspace as non-root user
2016-07-27 12:56:19 +03:00
e0c18374df Merge branch 'workspace-user' of github.com:computerfr33k/laradock into workspace-user 2016-07-27 02:56:59 -05:00
20adc9ca13 accidentally forgot to set INSTALL_NODE back to false. 2016-07-27 02:56:48 -05:00
dd9855d411 Update README.md 2016-07-27 02:49:43 -05:00
17e252a436 add non-root user for workspace container. 2016-07-27 02:43:38 -05:00
dd06f1e1a0 Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
2016-07-27 05:45:10 +03:00
2ba3060564 update the readme: switch to php 5.5 2016-07-27 05:44:36 +03:00
5612874b78 Merge pull request #187 from LaraDock/faster-builds
Faster builds
2016-07-27 05:30:30 +03:00
10af217349 update workspace build version 2016-07-27 04:39:54 +03:00
e65f0dceba add docker build version to the base image 2016-07-27 04:34:45 +03:00
c792a780ee use laradock php-fpm base images
to speed up the build time
2016-07-27 04:22:31 +03:00
2d1c1586f5 use laradock workspace base image
to speed up the build time
2016-07-27 04:22:20 +03:00
5bb3d3b6a8 rename PHP-FPM Dockerfile5 to Dockerfile56 2016-07-27 03:57:32 +03:00
b1ec5b8d6f Merge pull request #186 from computerfr33k/caddy
Update Caddyfile
2016-07-27 02:09:59 +03:00
6e07061deb Merge pull request #184 from computerfr33k/nginx-alpine
Nginx alpine image
2016-07-27 02:09:00 +03:00
97057f259c Update Caddyfile
fixes 404 errors for files in the public folder, such as css or js files.
2016-07-26 17:16:25 -05:00
e4f6cec536 fix nginx to actually log to files. 2016-07-26 12:53:26 -05:00
e6cf30e7ba re-added www-data user for nginx. log to stdout. 2016-07-26 12:41:52 -05:00
ed8e241007 use nginx:alpine as base. 2016-07-26 11:19:31 -05:00
c60cb9ab40 return apt-get update to HHVM 2016-07-25 07:47:17 +03:00
d58ef06907 refactoring some containers 2016-07-25 07:31:31 +03:00
462b5685eb add some comments sections to the php dockerfiles 2016-07-25 07:27:15 +03:00
11f7cfe729 fix an error missed COMPOSER_GLOBAL_INSTALL 2016-07-25 07:15:26 +03:00
d5ffc04034 remove data and application containers from the readme 2016-07-25 07:05:24 +03:00
062b7466f6 add composer.json to install global composer dependencies 2016-07-25 07:00:50 +03:00
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
419434020c merge back apt-get update and install to keep them on the same layer 2016-07-25 04:05:07 +03:00
2a02ed73e3 Refactor the workspace container 2016-07-25 02:48:38 +03:00
ca378ac734 add libz-dev library to php containers 2016-07-25 02:17:36 +03:00
67f92de4f0 Refactor the PHP 5 Dockerfile 2016-07-25 02:14:19 +03:00
c8d4461771 Refactor the PHP 7 Dockerfile 2016-07-25 01:30:19 +03:00
23b0906cd7 delete the Dockerfile-55 file and rename Dockerfile-56 to Dockerfile-5
Since 5.5 and 5.6 dockerfiles are identical execept the base image php version.
Will let the users switch the php 5.6 and 5.5 version from the Dockerfile-5 by changing one char
in the first line. Removing this duplication will make contribution and maintance easier and faster.
2016-07-24 23:25:31 +03:00
28a2d8e072 delete the .env file
making the central editing place is the docker-compose.yml file
2016-07-24 23:11:33 +03:00
f97f0b0d11 update readme: include hhvm and new logo 2016-07-24 07:39:25 +03:00
05e1dd4c13 Merge pull request #174 from orette/add-hhvm
Add hhvm
2016-07-24 07:27:40 +03:00
fc78ab7764 Merge remote-tracking branch 'upstream/master' into add-hhvm 2016-07-24 03:05:09 +00:00
ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
4dda3b969e add gitter link to the readme 2016-07-23 19:53:16 +03:00
4d2452101a add more awesome people to the contributors list 2016-07-22 00:36:26 +03:00
233cfb5b07 Merge pull request #169 from orette/create-code-standards-file
Added dot file to maintain consistent coding styles
2016-07-22 00:27:37 +03:00
63b9ec2bd8 Added dot file to maintain consistent coding styles 2016-07-21 09:48:21 -05:00
d5a51d4de9 Merge pull request #168 from appleboy/patch-2
convert tab to space.
2016-07-21 16:54:57 +03:00
c7fae1a807 convert tab to space. 2016-07-21 11:05:52 +08:00
d6329c26b3 Merge pull request #165 from orette/mongodb-library-fix
Added pkg-config to the PHP extentions and Tools that are installed from APT
2016-07-21 05:35:04 +03:00
a96ee88692 Added pkg-config to the PHP extentions and Tools that are installed from APT 2016-07-20 15:59:50 -05:00
2799a94a9f Merge pull request #159 from computerfr33k/master
Add caddy webserver container
2016-07-20 07:41:45 +03:00
5bcbe0d291 add rewrite rule to fix 404 errors when navigating to different pages. 2016-07-19 22:16:36 -05:00
9e7a669d5b incorporate upstream changes. 2016-07-19 22:01:20 -05:00
9b084433c3 add caddy server. 2016-07-19 21:51:20 -05:00
fc303dee08 Merge pull request #151 from computerfr33k/issue-147
Fix Memcached extension not installing
2016-07-18 23:55:18 +03:00
d75a43c615 Update Dockerfile-70
fixes memcached extension not installing
2016-07-16 13:07:56 -05:00
06337e6024 Merge pull request #144 from appleboy/patch-7
#140 update php 5.5 and 5.6
2016-07-14 15:29:54 +03:00
16b82d066e #140 update php 5.5 and 5.6
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-07-14 09:56:05 +08:00
074deec781 Merge branch 'master' of https://github.com/LaraDock/laradock
* 'master' of https://github.com/LaraDock/laradock:
  fix the volumes mapping
2016-07-14 04:28:12 +03:00
2d382b683a general updates to the readme 2016-07-14 04:27:45 +03:00
68576f9022 fix the volumes mapping 2016-07-13 17:04:06 +03:00
2df00ecdad remove installing Prestissimo by default, to prevent the warning 2016-07-13 16:00:47 +03:00
aeb5a6bb63 Merge pull request #140 from yewjs/patch-1
Update Dockerfile-70
2016-07-13 15:50:31 +03:00
2bbf59ddda Merge pull request #139 from Kauhat/master
Database volume mapping changes & documentation
2016-07-13 15:47:17 +03:00
dca0545293 Fixed incorrect php-fpm container mapping 2016-07-13 10:44:17 +01:00
5f99478c76 Fixed workspace container mapping volumes to wrong container 2016-07-13 10:08:13 +01:00
48a53f1d24 Update Dockerfile-70
install libJPEG and enabled in GD
2016-07-13 14:12:32 +08:00
11cdfd440b Updated README
References #135
2016-07-12 17:52:06 +01:00
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
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
d01d087431 Added more detail to the README 2016-07-12 16:38:20 +01:00
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
1b9630e8a1 Merge pull request #132 from Niksac/fix-readme
Update README.md
2016-07-07 21:39:26 +03:00
3a714339da Update README.md 2016-07-07 15:29:00 +02:00
65078505c1 Merge pull request #123 from appleboy/patch-6
Added support upload file size setting.
2016-06-28 16:06:29 +03:00
e0b4734dab Added support upload file size setting.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-28 17:18:37 +08:00
243392444f Merge pull request #122 from LaraDock/Hotfix/mongo
Hotfix/mongo
2016-06-27 14:00:09 +03:00
72a8fc049d Merge branch 'zhikiri-hotfix/mongo-support'
* zhikiri-hotfix/mongo-support:
  Fix conflict merging zhikiri-hotfix/mongo-support
2016-06-27 13:59:24 +03:00
de6db93da8 Fix conflict merging zhikiri-hotfix/mongo-support 2016-06-27 13:58:48 +03:00
1af9dc5ac2 Merge pull request #121 from zhikiri/feature/mcrypt-extension
Added supporting of the mcrypt extenstion
2016-06-27 13:45:37 +03:00
62878e7c49 Added supporting of the mcrypt extenstion 2016-06-27 11:30:25 +03:00
3cd1f070e1 Merge pull request #118 from appleboy/patch-5
remove duplicate white spaces
2016-06-25 20:38:54 +03:00
fb5ea7f42c remove duplicate white spaces
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-25 19:40:36 +08:00
aa8be6f95b list the contributors names in the readme
@benmag @mattythebatty @AminMkh @appleboy
2016-06-25 07:36:03 +03:00
aa0a726945 change enter container commands in the doc
`docker-compose run …` to `docker exec -it …`
2016-06-25 07:33:30 +03:00
e5e04e4e18 update the readme: exec command to run 2016-06-23 08:58:43 +03:00
44d8720400 Merge pull request #115 from appleboy/patch-2
Change command about enter workspace container.
2016-06-23 08:52:37 +03:00
f0200626ba Merge pull request #114 from Kauhat/master
Added support to conditionally install Prestissimo
2016-06-23 08:36:48 +03:00
69406db3e0 Change command about enter workspace container. 2016-06-23 13:16:52 +08:00
bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
ca413edff4 Merge pull request #112 from appleboy/patch-2
Fixed Change wrong project name.
2016-06-22 17:21:05 +03:00
f6d1d6f617 Fixed Change wrong project name. 2016-06-22 22:20:24 +08:00
117382a050 Merge branch 'pr/111'
(fix conflict)
* pr/111:
  add Node Version Manager (nvm)
2016-06-22 17:18:23 +03:00
2e930df2a7 Merge pull request #109 from appleboy/composer
Load xdebug Zend extension with phpunit command.
2016-06-22 16:57:08 +03:00
4922c5fafd add Node Version Manager (nvm)
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-22 09:33:17 +08:00
198c38f6cd Load xdebug Zend extension with phpunit command.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-21 14:03:39 +08:00
8d216f83d5 Merge pull request #101 from appleboy/gd
Support gd extension.
2016-06-16 17:47:04 +03:00
05c5fcf216 Support gd extension.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-16 14:57:27 +08:00
fccee522c6 update the readme 2016-06-11 20:49:04 +03:00
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
685c34d12d add Mongo Support to the Readme 2016-06-11 17:10:18 +03:00
ceba1af3ae Merge pull request #94 from AminMkh/AminMkh-mongodb-extension
added php-mongodb extension
2016-06-11 15:47:16 +03:00
c4100b5052 added php-mongodb extension 2016-06-11 14:38:26 +03:00
1148a3d051 Merge pull request #91 from LaraDock/xdebug
Xdebug
2016-06-03 15:06:57 +03:00
bec1a32550 format the laravel.ini file 2016-06-03 15:01:56 +03:00
72cde8a8ea Merge branch 'patch-3' of https://github.com/appleboy/laradock into appleboy-patch-3
* 'patch-3' of https://github.com/appleboy/laradock:
  clean apt source file after install.
  install xdebug to generate coverage report for unit testing.
2016-06-03 14:39:53 +03:00
4f9cdb02c6 link global gulp to be used locally 2016-06-03 14:16:46 +03:00
1673a80daf clean apt source file after install.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-03 14:21:52 +08:00
f130381cfe install xdebug to generate coverage report for unit testing.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-03 14:04:33 +08:00
eda286ded2 Merge pull request #87 from LaraDock/appleboy-patch-1
Appleboy patch 1 (fixing volumes mounting)
2016-06-03 01:52:24 +03:00
a8b4b61e28 update the volumes mounting of the DB containers 2016-06-03 01:50:11 +03:00
124a3553e6 simple reformatting 2016-06-01 14:45:27 +03:00
3ff4aaca79 set the original volume path 2016-06-01 14:44:40 +03:00
4c06a03ead get mongo volum from the data container 2016-06-01 14:44:10 +03:00
1cb131ba36 Merge branch 'master' of https://github.com/AminMkh/laradock into AminMkh-master
* 'master' of https://github.com/AminMkh/laradock:
  added mongodb driver for php5.5 5.6
  added mongodb image + PHP7 driver
2016-06-01 12:59:17 +03:00
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
8993cccc2c basic updates to the reamdme 2016-05-31 19:15:29 +03:00
1090bb4db6 added mongodb driver for php5.5 5.6 2016-05-30 23:26:40 +03:00
9c7054abe2 added mongodb image + PHP7 driver 2016-05-29 14:19:43 +03:00
e7decdaaf7 add debugging section to the readme 2016-05-28 11:04:05 +03:00
18bf12bfde Merge pull request #74 from abyshakes/master
Issue #73 unable to install workspace container
2016-05-26 21:17:51 +03:00
d829482a06 Issue #73 unable to install workspace container 2016-05-25 22:33:29 +05:30
86c6389650 Merge pull request #70 from Gummibeer/patch-2
Issue #69
2016-05-24 19:49:35 +03:00
991e28046d Issue #69
add memcached to php-cli
2016-05-24 16:44:52 +02:00
ccbc73c6bc update the readme file 2016-05-24 14:01:07 +03:00
246c7366ba Merge pull request #68 from Gummibeer/patch-1
Issue #67
2016-05-24 13:23:13 +03:00
762e2ec07b Issue #67
Issue #67
simpler docker IP-Address get command
2016-05-24 11:54:07 +02:00
adaaa25f47 remove the Laravel installer from the workspace container 2016-05-23 23:32:59 +03:00
11a13a0c33 Merge pull request #66 from AminMkh/workspace-postgres-driver
added postgres driver
2016-05-23 23:24:27 +03:00
c642560993 added postgres driver
added postgres driver to workspace container.
2016-05-23 23:20:07 +03:00
ea9f5c635f Merge pull request #64 from AminMkh/master
Update docker-compose.yml
2016-05-23 23:00:09 +03:00
fd4253afb6 Update docker-compose.yml 2016-05-23 22:23:10 +03:00
73310e45e8 Merge pull request #62 from AminMkh/master
Update README.MD
2016-05-23 21:53:55 +03:00
7f91fc9798 Update README.MD 2016-05-23 21:45:38 +03:00
a8a7685a40 basic changes to the readme format 2016-05-21 19:19:03 +03:00
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
8bff7656f6 add neo4j support to the readme file 2016-05-20 20:37:00 +03:00
5c9eb97db5 Support Neo4j DB (beta) 2016-05-20 20:35:10 +03:00
588819ab6d turn errors and access logs on by default for nginx 2016-05-20 20:32:33 +03:00
170b63a3ba edit redis volume 2016-05-20 09:26:29 +03:00
19813e48c3 add demo video to the readme 2016-05-20 09:24:26 +03:00
be7b8ee056 update the readme (installation steps) 2016-05-19 21:40:25 +03:00
01a056dd25 make the workspace container run automatically 2016-05-19 20:49:16 +03:00
70e1b0fe41 update readme file 2016-05-19 18:04:53 +03:00
0959b25c05 add sqlite support to the readme 2016-05-19 03:42:36 +03:00
1d8336a9e1 add cleaning to free some space during provisioning the workspace
Fixing E: You don't have enough free space in /var/cache/apt/archives/
2016-05-19 03:25:02 +03:00
f0e2d83618 add sqlite in the workspace
it could be removed to it’s own container later
2016-05-19 03:06:34 +03:00
7f1deb0342 update how to get IP address on Linux, in the readme 2016-05-19 02:49:07 +03:00
703887a2a6 add Node, Gulp and Bower to the readme 2016-05-18 22:54:46 +03:00
84e6b2b6ff Merge pull request #52 from mattythebatty/add-npm-bower-gulp
Install node, npm, gulp and bower to the workspace container
2016-05-18 22:49:31 +03:00
c3ff9e485b Install node, npm, gulp and bower to the workspace container 2016-05-18 20:20:16 +01:00
77f9183c83 reformat the readme file (organize all the sections) 2016-05-18 20:56:48 +03:00
378181044c update readme file
- Add “Change the PHP-CLI Version”
- Add “Install PHP Extensions”
2016-05-18 20:21:15 +03:00
01bdaae690 Add "Run Artisan Commands" to the readme 2016-05-18 11:48:02 +03:00
68aca9f8f9 small updates to the readme file 2016-05-18 11:24:13 +03:00
6d0ecaecf4 general updates to the readme files 2016-05-18 11:17:58 +03:00
a434588a66 Merge pull request #50 from LaraDock/develop
Develop
2016-05-18 11:14:59 +03:00
5aa01b1757 add the new way of using LaraDock in the readme 2016-05-18 11:12:21 +03:00
3b2831bf1d add alias for phpunit in the .bashrc 2016-05-18 10:25:54 +03:00
7171996843 replace composer path 2016-05-18 09:05:45 +03:00
66f08a4f60 fix .bashrc exports and alises 2016-05-18 08:40:08 +03:00
07a07ab3ac install php xml in the workspace container 2016-05-18 08:23:53 +03:00
fb4fcdcb23 Install the Laravel Installer in the workspace container 2016-05-18 08:07:54 +03:00
a69681b07c install the php zip extention in the workspace 2016-05-18 07:58:33 +03:00
2c05c87400 update the logs section 2016-05-18 07:56:12 +03:00
16a1041ef5 clean the workspace container 2016-05-18 07:53:14 +03:00
5ef193d55b update readme 2016-05-18 07:16:20 +03:00
4d8a798224 Create Application Container to hold App code 2016-05-18 07:13:19 +03:00
1574231a80 replace ubuntu 16.04 with lighter ubuntu version 2016-05-18 07:11:49 +03:00
6eb3a9bd5f fix nginx not connecting to php port 9000 2016-05-18 06:29:33 +03:00
377f24fe2b keep workspace container alive with tty 2016-05-18 06:28:31 +03:00
51b6d4f844 update readme file (php section) 2016-05-18 04:38:46 +03:00
97500508f5 reformat the workspace Dockerfile 2016-05-18 03:54:21 +03:00
7dcf481d21 install nano in the workspace container 2016-05-18 02:54:35 +03:00
efd062fd88 fix linking containers to php-fpm instead of php 2016-05-18 02:54:23 +03:00
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
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
36b49f5ae2 formatting and small updates 2016-05-17 23:47:26 +03:00
e49836ba90 Merge pull request #48 from appleboy/patch-1
Replace docker-compose rm with down command.
2016-05-17 17:35:12 +03:00
84f766363d Replace docker-compose rm with down command. 2016-05-17 10:50:51 +08:00
03c991c89d Merge pull request #47 from mattythebatty/php-5-memcached
Add memcached support for PHP 5.5 & 5.6
2016-05-14 19:47:37 +03:00
fdba7e7c09 add memcached support for PHP 5.5 & 5.6 2016-05-14 17:21:36 +01:00
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
7f4e411d3d link containers to PHP 2016-05-14 04:20:20 +03:00
e946573d75 general updates to the readme file 2016-05-13 02:00:25 +03:00
470873acd2 add Memcached support to the readme file 2016-05-12 15:23:42 +03:00
88d5dd7806 Merge pull request #44 from mattythebatty/memcached-support
Memcached support
2016-05-12 15:12:46 +03:00
295a0974da install php memcached 2016-05-12 02:28:44 +01:00
cf89670671 add memcached support 2016-05-12 02:17:39 +01:00
40899bc40f remove the duplicated volumes from DBs dockerfiles 2016-05-09 15:53:16 +03:00
64bf3222af set php work directory to laravel's directory 2016-05-09 15:45:54 +03:00
79009cc97e Merge branch 'benmag-master'
* benmag-master:
  Install pdo_pgsql extension
2016-05-09 14:59:13 +03:00
571bf64eb2 Install pdo_pgsql extension 2016-05-09 13:08:08 +10:00
75b1705820 Merge remote-tracking branch 'LaraDock/master' 2016-05-09 12:09:57 +10:00
12587bc712 Support Beanstalkd and Beanstalkd Console
Closes feature #38
2016-05-09 05:02:15 +03:00
81f2602464 Support MariaDB
closes feature #21
2016-05-09 04:23:03 +03:00
ecefee4d65 update postgres volume path 2016-05-09 04:20:03 +03:00
de8cbb0605 simple updates to docker compose and readme 2016-05-08 15:21:59 +03:00
5190da831a remove containers names from docker-compose
to void conflict while scalling using the scale command
2016-05-08 13:39:43 +03:00
fdaa983e77 update readme, put requirements in table 2016-05-08 11:25:43 +03:00
e52f8f5613 update readme file, add more details on linux 2016-05-08 10:54:10 +03:00
f9c13090c6 general updates to the readme file 2016-05-07 19:59:59 +03:00
bfa0d54b5a add features list to the readme file 2016-05-07 19:51:45 +03:00
7f80888fc1 add more info to the readme file 2016-05-07 18:48:27 +03:00
aa338d534e Merge remote-tracking branch 'LaraDock/master' 2016-05-07 14:53:55 +10:00
31793a3cc9 general updates to the readme file 2016-05-07 05:58:20 +03:00
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
26229e150d Merge pull request #35 from benmag/master
link postgres service to php service
2016-05-07 05:14:01 +03:00
ab7f3d8fd9 Merge remote-tracking branch 'LaraDock/master' 2016-05-07 12:12:43 +10:00
2b98b0b82e update the readme, include supported containers 2016-05-07 05:10:57 +03:00
457c5d4b1b update the readme file
Support selecting your own containers in the docker compose command.
2016-05-07 05:03:07 +03:00
cd97ac0aa6 link postgres service to php service 2016-05-07 11:55:00 +10:00
22f11e03ee Merge pull request #34 from benmag/master
Add support for postgres
2016-05-07 04:34:27 +03:00
5d62ec1e67 Add support for postgres 2016-05-07 11:16:06 +10:00
daa5ed981f Merge pull request #32 from LaraDock/develop
Major Updates
2016-05-06 18:55:57 +03:00
9ac7541dc9 upgrade the readme.md to reflect the last changes 2016-05-06 18:33:09 +03:00
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
12051834a3 include screencast tutorial link 2016-04-28 23:40:30 +03:00
e2593ab522 make submodule add optional in the docs 2016-04-22 17:35:11 +03:00
4f9271d565 Merge pull request #29 from chungth/master
use git submodule instead of git clone when install
2016-04-18 14:10:16 +03:00
c447eb86e4 use git submodule instead of git clone 2016-04-18 19:48:29 +09:00
530ffe7433 remove redis restart always from the docker compose file 2016-04-18 12:08:57 +03:00
c8718e3746 update the logos image 2016-04-12 23:30:01 +03:00
feaff6fa72 update the documenation 2016-04-12 16:47:45 +03:00
d98cf4754b simplify the usage steps and create installation steps 2016-04-11 07:50:33 +03:00
b335364591 fix the documentation 2016-04-08 11:47:35 +03:00
105fce8965 simlify and reduce the usage steps 2016-04-08 11:33:33 +03:00
0973aaf166 update the documenation - make redis optional 2016-04-08 00:48:32 +03:00
b5be47fb5e fix a typo in the doc 2016-04-06 08:47:31 +03:00
29 changed files with 1745 additions and 210 deletions

12
.editorconfig Normal file
View File

@ -0,0 +1,12 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
[*]
charset = utf-8
[{Dockerfile,docker-compose.yml}]
indent_style = space
indent_size = 4

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/logs
/data
.env

1029
README.md

File diff suppressed because it is too large Load Diff

17
apache2/Dockerfile Normal file
View File

@ -0,0 +1,17 @@
FROM webdevops/apache:ubuntu-16.04
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
ARG PHP_SOCKET="php-fpm:9000"
ENV WEB_PHP_SOCKET=$PHP_SOCKET
ENV WEB_DOCUMENT_ROOT=/var/www/laravel/public
EXPOSE 80 443
WORKDIR /var/www/laravel/public
ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
CMD ["supervisord"]

View File

@ -0,0 +1,17 @@
FROM php:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
RUN apt-get update && apt-get install -y curl
RUN curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
RUN mv /tmp/beanstalk_console-master /source
RUN apt-get remove --purge -y curl && \
apt-get autoclean && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
EXPOSE 2080
CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public'

16
beanstalkd/Dockerfile Normal file
View File

@ -0,0 +1,16 @@
FROM phusion/baseimage:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
ENV DEBIAN_FRONTEND noninteractive
ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN apt-get update
RUN apt-get install -y beanstalkd
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
VOLUME /var/lib/beanstalkd/data
EXPOSE 11300
CMD ["/usr/bin/beanstalkd"]

17
caddy/Caddyfile Normal file
View File

@ -0,0 +1,17 @@
# Docs: https://caddyserver.com/docs/caddyfile
0.0.0.0:80
root /var/www/laravel/public
fastcgi / php-fpm:9000 php {
index index.php
}
rewrite {
r .*
ext /
to /index.php?{query}
}
browse
log stdout
errors stderr
# Uncomment to enable TLS (HTTPS)
# Change the first list to listen on port 443 when enabling TLS
#tls self_signed

25
caddy/Dockerfile Normal file
View File

@ -0,0 +1,25 @@
FROM alpine:3.4
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
LABEL caddy_version="0.9.0" architecture="amd64"
RUN apk update \
&& apk upgrade \
&& apk add tar curl
RUN curl --silent --show-error --fail --location \
--header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
"https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \
| tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
&& mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
&& chmod 0755 /usr/bin/caddy \
&& /usr/bin/caddy -version
EXPOSE 80 443 2015
WORKDIR /var/www/laravel/public
ENTRYPOINT ["caddy"]
CMD ["-conf", "/etc/Caddyfile"]

View File

@ -1,61 +1,218 @@
# PHP + NGINX Container #---------------------------------- version: '2'
php-nginx:
image: laradock/php56nginx:0.1.0 services:
container_name: php-nginx
### Workspace Utilities Container ###########################
workspace:
build:
context: ./workspace
args:
- INSTALL_MONGO=false
- INSTALL_XDEBUG=false
- INSTALL_NODE=false
- COMPOSER_GLOBAL_INSTALL=false
- PUID=1000
- PGID=1000
volumes_from:
- volumes_source
tty: true
### PHP-FPM Container #######################################
php-fpm:
build:
context: ./php-fpm
args:
- INSTALL_MONGO=false
- INSTALL_XDEBUG=false
dockerfile: Dockerfile-70
volumes_from:
- volumes_source
expose:
- "9000"
links:
- workspace
### Nginx Server Container ##################################
nginx:
build:
context: ./nginx
args:
- PHP_UPSTREAM=php-fpm
volumes_from:
- volumes_source
volumes:
- ./logs/nginx/:/var/log/nginx
ports: ports:
- "80:80" - "80:80"
volumes: - "443:443"
- ./settings/nginx:/etc/nginx/sites-available
- ../:/var/www
- ./logs/nginx:/var/log/nginx
links: links:
- mysql - php-fpm
- redis
privileged: true
extra_hosts:
- "laravel.dev:xxx.xxx.xxx.xxx"
# MySQL Container #---------------------------------------- ### Apache Server Container ##################################
mysql:
image: laradock/mysql:0.1.0 apache2:
container_name: mysql build:
context: ./apache2
args:
- PHP_SOCKET="php-fpm:9000"
volumes_from:
- volumes_source
volumes:
- ./logs/apache2:/var/log/apache2
ports:
- "80:80"
- "443:443"
links:
- php-fpm
### HHVM Container ##########################################
hhvm:
build: ./hhvm
volumes_from:
- volumes_source
expose:
- "9000"
links:
- workspace
### MySQL Container #########################################
mysql:
build: ./mysql
volumes_from:
- volumes_data
ports: ports:
- "3306:3306" - "3306:3306"
volumes_from:
- data
environment: environment:
MYSQL_DATABASE: homestead MYSQL_DATABASE: homestead
MYSQL_USER: homestead MYSQL_USER: homestead
MYSQL_PASSWORD: secret MYSQL_PASSWORD: secret
privileged: true MYSQL_ROOT_PASSWORD: root
# Redis Container #---------------------------------------- ### PostgreSQL Container ####################################
redis:
image: laradock/redis:0.1.0 postgres:
container_name: redis build: ./postgres
volumes_from:
- volumes_data
ports:
- "5432:5432"
environment:
POSTGRES_DB: homestead
POSTGRES_USER: homestead
POSTGRES_PASSWORD: secret
### MariaDB Container #######################################
mariadb:
build: ./mariadb
volumes_from:
- volumes_data
ports:
- "3306:3306"
environment:
MYSQL_DATABASE: homestead
MYSQL_USER: homestead
MYSQL_PASSWORD: secret
MYSQL_ROOT_PASSWORD: root
### Neo4j Container #########################################
neo4j:
build: ./neo4j
ports:
- "7474:7474"
- "1337:1337"
environment:
- NEO4J_AUTH=homestead:secret
volumes_from:
- volumes_data
### MongoDB Container #######################################
mongo:
build: ./mongo
ports:
- "27017:27017"
volumes_from:
- volumes_data
### Redis Container #########################################
redis:
build: ./redis
volumes_from:
- volumes_data
ports: ports:
- "6379:6379" - "6379:6379"
### Memcached Container #####################################
memcached:
build: ./memcached
volumes_from: volumes_from:
- data - volumes_data
volumes: ports:
- ./logs/redis:/var/log/redis - "11211:11211"
restart: always links:
- php-fpm
### Beanstalkd Container ####################################
beanstalkd:
build: ./beanstalkd
ports:
- "11300:11300"
privileged: true privileged: true
links:
- php-fpm
# Data Volume Container #---------------------------------- ### Beanstalkd Console Container ############################
data:
image: laradock/data:0.1.0 beanstalkd-console:
container_name: data build: ./beanstalkd-console
ports:
- "2080:2080"
links:
- beanstalkd
### Caddy Server Container ##################################
caddy:
build: ./caddy
volumes_from:
- volumes_source
ports:
- "80:80"
- "443:443"
- "2015:2015"
volumes: volumes:
- /var/lib/mysql - ./caddy/Caddyfile:/etc/Caddyfile
- /var/lib/redis links:
- php-fpm
# Beanstalkd Container #----------------------------------- ### Laravel Application Code Container ######################
# beanstalkd:
# image: laradock/beanstalkd:0.1.0
# container_name: beanstalkd
# ports:
# - "11300:11300"
# privileged: true
#---------------------------------------------------------- volumes_source:
build: ./volumes/application
volumes:
- ../:/var/www/laravel
### Databases Data Container ################################
volumes_data:
build: ./volumes/data
volumes:
- ./data/mysql:/var/lib/mysql
- ./data/postgres:/var/lib/postgres
- ./data/mariadb:/var/lib/mariadb
- ./data/memcached:/var/lib/memcached
- ./data/redis:/data
- ./data/neo4j:/var/lib/neo4j/data
- ./data/mongo:/data/db
### Add more Containers below ###############################

23
hhvm/Dockerfile Normal file
View File

@ -0,0 +1,23 @@
FROM ubuntu:14.04
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449
RUN apt-get update -y \
&& apt-get install -y software-properties-common \
&& add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
&& apt-get update -y \
&& apt-get install -y hhvm \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/www/laravel
ADD server.ini /etc/hhvm/server.ini
RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel
CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
EXPOSE 9000

20
hhvm/server.ini Normal file
View File

@ -0,0 +1,20 @@
; php options
pid = /var/run/hhvm/pid
; hhvm specific
hhvm.server.port = 9000
hhvm.server.type = fastcgi
hhvm.server.default_document = index.php
hhvm.server.error_document404 = index.php
hhvm.server.upload.upload_max_file_size = 25M
hhvm.log.level = Error
hhvm.log.header = true
hhvm.log.access[default][file] = /var/log/hhvm/access.log
hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
hhvm.server.source_root=/var/www/laravel/public
hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
; Uncomment to log to files instead of STDOUT
;hhvm.log.use_log_file = true
;hhvm.log.file = /var/log/hhvm/error.log

7
mariadb/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM mariadb:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
CMD ["mysqld"]
EXPOSE 3306

7
memcached/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM memcached:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
CMD ["memcached"]
EXPOSE 11211

12
mongo/Dockerfile Normal file
View File

@ -0,0 +1,12 @@
FROM mongo:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
#COPY mongo.conf /usr/local/etc/mongo/mongo.conf
VOLUME /data/db /data/configdb
CMD ["mongod"]
EXPOSE 27017

7
mysql/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM mysql:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
CMD ["mysqld"]
EXPOSE 3306

7
neo4j/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM tpires/neo4j
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
VOLUME /var/lib/neo4j/data
EXPOSE 7474 1337

19
nginx/Dockerfile Normal file
View File

@ -0,0 +1,19 @@
FROM nginx:alpine
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
ADD nginx.conf /etc/nginx/
ADD laravel.conf /etc/nginx/conf.d/laravel.conf
ARG PHP_UPSTREAM=php-fpm
RUN apk update \
&& apk upgrade \
&& apk add --no-cache bash \
&& adduser -D -H -u 1000 -s /bin/bash www-data \
&& rm /etc/nginx/conf.d/default.conf \
&& echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
CMD ["nginx"]
EXPOSE 80 443

View File

@ -2,18 +2,16 @@ server {
listen 80 default_server; listen 80 default_server;
listen [::]:80 default_server ipv6only=on; listen [::]:80 default_server ipv6only=on;
root /var/www/public; root /var/www/laravel/public;
index index.php index.html index.htm; index index.php index.html index.htm;
server_name laravel.dev;
location / { location / {
try_files $uri $uri/ /index.php$is_args$args; try_files $uri $uri/ /index.php$is_args$args;
} }
location ~ \.php$ { location ~ \.php$ {
try_files $uri /index.php =404; try_files $uri /index.php =404;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass php-upstream;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;
@ -23,3 +21,6 @@ server {
deny all; deny all;
} }
} }

28
nginx/nginx.conf Normal file
View File

@ -0,0 +1,28 @@
user www-data;
worker_processes 4;
pid /run/nginx.pid;
daemon off;
events {
worker_connections 2048;
multi_accept on;
use epoll;
}
http {
server_tokens off;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
keepalive_timeout 15;
types_hash_max_size 2048;
client_max_body_size 20M;
include /etc/nginx/mime.types;
default_type application/octet-stream;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
gzip on;
gzip_disable "msie6";
include /etc/nginx/conf.d/*.conf;
open_file_cache max=100;
}

74
php-fpm/Dockerfile-56 Normal file
View File

@ -0,0 +1,74 @@
#
#--------------------------------------------------------------------------
# Image Setup
#--------------------------------------------------------------------------
#
FROM laradock/php-fpm:5.6--1.0
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
#
#--------------------------------------------------------------------------
# Mandatory Software's Installation
#--------------------------------------------------------------------------
#
# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
# are installed on the base image 'laradock/php-fpm' image. If you want
# to add more Software's or remove existing one, you need to edit the
# base image (https://github.com/LaraDock/php-fpm).
#
#
#--------------------------------------------------------------------------
# Optional Software's Installation
#--------------------------------------------------------------------------
#
# Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build.
#
# - INSTALL_XDEBUG= false
# - INSTALL_MONGO= false
#
#####################################
# xDebug:
#####################################
ARG INSTALL_XDEBUG=true
ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extention
pecl install xdebug && \
docker-php-ext-enable xdebug \
;fi
#####################################
# MongoDB:
#####################################
ARG INSTALL_MONGO=true
ENV INSTALL_MONGO ${INSTALL_MONGO}
RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extention
pecl install mongodb \
;fi
#
#--------------------------------------------------------------------------
# Final Touch
#--------------------------------------------------------------------------
#
ADD ./laravel.ini /usr/local/etc/php/conf.d
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
RUN rm -r /var/lib/apt/lists/*
RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel
CMD ["php-fpm"]
EXPOSE 9000

74
php-fpm/Dockerfile-70 Normal file
View File

@ -0,0 +1,74 @@
#
#--------------------------------------------------------------------------
# Image Setup
#--------------------------------------------------------------------------
#
FROM laradock/php-fpm:7.0--1.0
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
#
#--------------------------------------------------------------------------
# Mandatory Software's Installation
#--------------------------------------------------------------------------
#
# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
# are installed on the base image 'laradock/php-fpm' image. If you want
# to add more Software's or remove existing one, you need to edit the
# base image (https://github.com/LaraDock/php-fpm).
#
#
#--------------------------------------------------------------------------
# Optional Software's Installation
#--------------------------------------------------------------------------
#
# Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build.
#
# - INSTALL_XDEBUG= false
# - INSTALL_MONGO= false
#
#####################################
# xDebug:
#####################################
ARG INSTALL_XDEBUG=true
ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extention
pecl install xdebug && \
docker-php-ext-enable xdebug \
;fi
#####################################
# MongoDB:
#####################################
ARG INSTALL_MONGO=true
ENV INSTALL_MONGO ${INSTALL_MONGO}
RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extention
pecl install mongodb \
;fi
#
#--------------------------------------------------------------------------
# Final Touch
#--------------------------------------------------------------------------
#
ADD ./laravel.ini /usr/local/etc/php/conf.d
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
RUN rm -r /var/lib/apt/lists/*
RUN usermod -u 1000 www-data
WORKDIR /var/www/laravel
CMD ["php-fpm"]
EXPOSE 9000

14
php-fpm/laravel.ini Normal file
View File

@ -0,0 +1,14 @@
date.timezone=UTC
display_errors=Off
log_errors=On
extension=mongodb.so
; Maximum amount of memory a script may consume (128MB)
; http://php.net/memory-limit
memory_limit = 128M
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
upload_max_filesize = 20M
; Sets max size of post data allowed.
; http://php.net/post-max-size
post_max_size = 20M

76
php-fpm/laravel.pool.conf Normal file
View File

@ -0,0 +1,76 @@
; Unix user/group of processes
; Note: The user is mandatory. If the group is not set, the default user's group
; will be used.
user = www-data
group = www-data
; The address on which to accept FastCGI requests.
; Valid syntaxes are:
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
; a specific port;
; 'port' - to listen on a TCP socket to all addresses on a
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
listen = 0.0.0.0:9000
; Choose how the process manager will control the number of child processes.
; Possible Values:
; static - a fixed number (pm.max_children) of child processes;
; dynamic - the number of child processes are set dynamically based on the
; following directives. With this process management, there will be
; always at least 1 children.
; pm.max_children - the maximum number of children that can
; be alive at the same time.
; pm.start_servers - the number of children created on startup.
; pm.min_spare_servers - the minimum number of children in 'idle'
; state (waiting to process). If the number
; of 'idle' processes is less than this
; number then some children will be created.
; pm.max_spare_servers - the maximum number of children in 'idle'
; state (waiting to process). If the number
; of 'idle' processes is greater than this
; number then some children will be killed.
; ondemand - no children are created at startup. Children will be forked when
; new requests will connect. The following parameter are used:
; pm.max_children - the maximum number of children that
; can be alive at the same time.
; pm.process_idle_timeout - The number of seconds after which
; an idle process will be killed.
; Note: This value is mandatory.
pm = dynamic
; The number of child processes to be created when pm is set to 'static' and the
; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
; This value sets the limit on the number of simultaneous requests that will be
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
; CGI. The below defaults are based on a server without much resources. Don't
; forget to tweak pm.* to fit your needs.
; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
; Note: This value is mandatory.
pm.max_children = 20
; The number of child processes created on startup.
; Note: Used only when pm is set to 'dynamic'
; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
pm.start_servers = 2
; The desired minimum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
pm.min_spare_servers = 1
; The desired maximum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
pm.max_spare_servers = 3
;---------------------
; Make specific Docker environment variables available to PHP
env[DB_1_ENV_MYSQL_DATABASE] = $DB_1_ENV_MYSQL_DATABASE
env[DB_1_ENV_MYSQL_USER] = $DB_1_ENV_MYSQL_USER
env[DB_1_ENV_MYSQL_PASSWORD] = $DB_1_ENV_MYSQL_PASSWORD
catch_workers_output = yes

7
postgres/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM postgres:latest
MAINTAINER Ben M <git@bmagg.com>
CMD ["postgres"]
EXPOSE 5432

11
redis/Dockerfile Normal file
View File

@ -0,0 +1,11 @@
FROM redis:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
#COPY redis.conf /usr/local/etc/redis/redis.conf
VOLUME /data
EXPOSE 6379
CMD ["redis-server"]

View File

@ -0,0 +1,7 @@
FROM debian:jessie
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
WORKDIR /var/www/laravel
CMD ["true"]

5
volumes/data/Dockerfile Normal file
View File

@ -0,0 +1,5 @@
FROM debian:jessie
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
CMD ["true"]

136
workspace/Dockerfile Normal file
View File

@ -0,0 +1,136 @@
#
#--------------------------------------------------------------------------
# Image Setup
#--------------------------------------------------------------------------
#
FROM laradock/workspace:1.0
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
#
#--------------------------------------------------------------------------
# Mandatory Software's Installation
#--------------------------------------------------------------------------
#
# Mandatory Software's such as ("php7.0-cli", "git", "vim", ....) are
# installed on the base image 'laradock/workspace' image. If you want
# to add more Software's or remove existing one, you need to edit the
# base image (https://github.com/LaraDock/workspace).
#
#
#--------------------------------------------------------------------------
# Optional Software's Installation
#--------------------------------------------------------------------------
#
# Optional Software's will only be installed if you set them to `true`
# in the `docker-compose.yml` before the build.
#
# - INSTALL_XDEBUG= false
# - INSTALL_MONGO= false
# - COMPOSER_GLOBAL_INSTALL= false
# - INSTALL_NODE= false
#
#####################################
# xDebug:
#####################################
# Check if xDebug needs to be installed
ARG INSTALL_XDEBUG=true
ENV INSTALL_XDEBUG ${INSTALL_XDEBUG}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Load the xdebug extension only with phpunit commands
apt-get install -y --force-yes php7.0-xdebug && \
sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini && \
echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
;fi
#####################################
# MongoDB:
#####################################
# Check if Mongo needs to be installed
ARG INSTALL_MONGO=true
ENV INSTALL_MONGO ${INSTALL_MONGO}
RUN if [ ${INSTALL_MONGO} = true ]; then \
# Install the mongodb extension
pecl install mongodb && \
echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini \
;fi
#####################################
# Non-Root User:
#####################################
# Add a non-root user to prevent files being created with root permissions on host machine.
ARG PUID=1000
ARG PGID=1000
RUN groupadd -g $PGID laradock && \
useradd -u $PUID -g laradock -m laradock
#####################################
# Composer:
#####################################
# Add the composer.json
COPY ./composer.json /home/laradock/.composer/composer.json
# Make sure that ~/.composer belongs to laradock
RUN chown -R laradock:laradock /home/laradock/.composer
USER laradock
# Check if global install need to be ran
ARG COMPOSER_GLOBAL_INSTALL=true
ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
# run the install
composer global install \
;fi
#####################################
# Node / NVM:
#####################################
# Check if NVM needs to be installed
ARG INSTALL_NODE=true
ENV INSTALL_NODE ${INSTALL_NODE}
RUN if [ ${INSTALL_NODE} = true ]; then \
# Install nvm (A Node Version Manager)
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash \
;fi
# Again check if NVM needs to be installed
# I had to split this condition link this because when I get it inside the above if statement is refuses to work!
ENV if [ ${INSTALL_NODE} = true ]; then \
# Set the ENV
NVM_DIR=/home/laradock/.nvm \
# Install NodeJS with NVM
RUN . ~/.nvm/nvm.sh && \
nvm install stable && \
nvm use stable && \
nvm alias stable && \
npm install -g gulp bower \
;fi
# Wouldn't execute when added to the RUN statement in the above block
# Source NVM when loading bash since ~/.profile isn't loaded on non-login shell
RUN if [ ${INSTALL_NODE} = true ]; then \
echo "" >> ~/.bashrc && \
echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc && \
echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \
;fi
#
#--------------------------------------------------------------------------
# Final Touch
#--------------------------------------------------------------------------
#
# Clean up
USER root
RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Set default work directory
WORKDIR /var/www/laravel

5
workspace/composer.json Normal file
View File

@ -0,0 +1,5 @@
{
"require": {
}
}