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
