Commit Graph

903 Commits

Author SHA1 Message Date
Eric Pfeiffer ed8e241007 use nginx:alpine as base. 2016-07-26 11:19:31 -05:00
Mahmoud Zalt c60cb9ab40 return `apt-get update` to HHVM 2016-07-25 07:47:17 +03:00
Mahmoud Zalt d58ef06907 refactoring some containers 2016-07-25 07:31:31 +03:00
Mahmoud Zalt 462b5685eb add some comments sections to the php dockerfiles 2016-07-25 07:27:15 +03:00
Mahmoud Zalt 11f7cfe729 fix an error missed COMPOSER_GLOBAL_INSTALL 2016-07-25 07:15:26 +03:00
Mahmoud Zalt d5ffc04034 remove data and application containers from the readme 2016-07-25 07:05:24 +03: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 419434020c merge back apt-get update and install to keep them on the same layer 2016-07-25 04:05:07 +03:00
Mahmoud Zalt 2a02ed73e3 Refactor the workspace container 2016-07-25 02:48:38 +03:00
Mahmoud Zalt ca378ac734 add libz-dev library to php containers 2016-07-25 02:17:36 +03:00
Mahmoud Zalt 67f92de4f0 Refactor the PHP 5 Dockerfile 2016-07-25 02:14:19 +03:00
Mahmoud Zalt c8d4461771 Refactor the PHP 7 Dockerfile 2016-07-25 01:30:19 +03:00
Mahmoud Zalt 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
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
Mahmoud Zalt f97f0b0d11 update readme: include hhvm and new logo 2016-07-24 07:39:25 +03:00
Mahmoud Zalt 05e1dd4c13 Merge pull request #174 from orette/add-hhvm
Add hhvm
2016-07-24 07:27:40 +03:00
orette fc78ab7764 Merge remote-tracking branch 'upstream/master' into add-hhvm 2016-07-24 03:05:09 +00:00
orette ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
Mahmoud Zalt 4dda3b969e add gitter link to the readme 2016-07-23 19:53:16 +03:00
Mahmoud Zalt 4d2452101a add more awesome people to the contributors list 2016-07-22 00:36:26 +03:00
Mahmoud Zalt 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
Orette D'Aguilar 63b9ec2bd8 Added dot file to maintain consistent coding styles 2016-07-21 09:48:21 -05:00
Mahmoud Zalt d5a51d4de9 Merge pull request #168 from appleboy/patch-2
convert tab to space.
2016-07-21 16:54:57 +03:00
Bo-Yi Wu c7fae1a807 convert tab to space. 2016-07-21 11:05:52 +08:00
Mahmoud Zalt 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
Orette D'Aguilar a96ee88692 Added pkg-config to the PHP extentions and Tools that are installed from APT 2016-07-20 15:59:50 -05:00
Mahmoud Zalt 2799a94a9f Merge pull request #159 from computerfr33k/master
Add caddy webserver container
2016-07-20 07:41:45 +03:00
Eric Pfeiffer 5bcbe0d291 add rewrite rule to fix 404 errors when navigating to different pages. 2016-07-19 22:16:36 -05: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 fc303dee08 Merge pull request #151 from computerfr33k/issue-147
Fix Memcached extension not installing
2016-07-18 23:55:18 +03:00
Eric Pfeiffer d75a43c615 Update Dockerfile-70
fixes memcached extension not installing
2016-07-16 13:07:56 -05:00
Mahmoud Zalt 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
Bo-Yi Wu 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
Mahmoud Zalt 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
Mahmoud Zalt 2d382b683a general updates to the readme 2016-07-14 04:27:45 +03: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
Mahmoud Zalt aeb5a6bb63 Merge pull request #140 from yewjs/patch-1
Update Dockerfile-70
2016-07-13 15:50:31 +03:00
Mahmoud Zalt 2bbf59ddda Merge pull request #139 from Kauhat/master
Database volume mapping changes & documentation
2016-07-13 15:47:17 +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
Yew JS 48a53f1d24 Update Dockerfile-70
install libJPEG and enabled in GD
2016-07-13 14:12:32 +08:00
Jack Fletcher 11cdfd440b Updated README
References #135
2016-07-12 17:52:06 +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 d01d087431 Added more detail to the README 2016-07-12 16:38:20 +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
Mahmoud Zalt 1b9630e8a1 Merge pull request #132 from Niksac/fix-readme
Update README.md
2016-07-07 21:39:26 +03:00