Commit Graph

1082 Commits

Author SHA1 Message Date
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
Niksac
3a714339da Update README.md 2016-07-07 15:29:00 +02:00
Mahmoud Zalt
65078505c1 Merge pull request #123 from appleboy/patch-6
Added support upload file size setting.
2016-06-28 16:06:29 +03:00
Bo-Yi Wu
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
Mahmoud Zalt
243392444f Merge pull request #122 from LaraDock/Hotfix/mongo
Hotfix/mongo
2016-06-27 14:00:09 +03:00
Mahmoud Zalt
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
Mahmoud Zalt
de6db93da8 Fix conflict merging zhikiri-hotfix/mongo-support 2016-06-27 13:58:48 +03:00
Mahmoud Zalt
1af9dc5ac2 Merge pull request #121 from zhikiri/feature/mcrypt-extension
Added supporting of the mcrypt extenstion
2016-06-27 13:45:37 +03:00
zhikiri
62878e7c49 Added supporting of the mcrypt extenstion 2016-06-27 11:30:25 +03:00
Mahmoud Zalt
3cd1f070e1 Merge pull request #118 from appleboy/patch-5
remove duplicate white spaces
2016-06-25 20:38:54 +03:00
Bo-Yi Wu
fb5ea7f42c remove duplicate white spaces
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-25 19:40:36 +08:00
Mahmoud Zalt
aa8be6f95b list the contributors names in the readme
@benmag @mattythebatty @AminMkh @appleboy
2016-06-25 07:36:03 +03:00
Mahmoud Zalt
aa0a726945 change enter container commands in the doc
`docker-compose run …` to `docker exec -it …`
2016-06-25 07:33:30 +03:00
Luciano Jr
5ebb061b70 Merge pull request #3 from LaraDock/master
Merge
2016-06-24 15:19:12 +01:00
Mahmoud Zalt
e5e04e4e18 update the readme: exec command to run 2016-06-23 08:58:43 +03:00
Mahmoud Zalt
44d8720400 Merge pull request #115 from appleboy/patch-2
Change command about enter workspace container.
2016-06-23 08:52:37 +03:00
Mahmoud Zalt
f0200626ba Merge pull request #114 from Kauhat/master
Added support to conditionally install Prestissimo
2016-06-23 08:36:48 +03:00
Bo-Yi Wu
69406db3e0 Change command about enter workspace container. 2016-06-23 13:16:52 +08:00
Jack Fletcher
bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt
ca413edff4 Merge pull request #112 from appleboy/patch-2
Fixed Change wrong project name.
2016-06-22 17:21:05 +03:00
Bo-Yi Wu
f6d1d6f617 Fixed Change wrong project name. 2016-06-22 22:20:24 +08:00
Mahmoud Zalt
117382a050 Merge branch 'pr/111'
(fix conflict)
* pr/111:
  add Node Version Manager (nvm)
2016-06-22 17:18:23 +03:00