Eric Pfeiffer
e0c18374df
Merge branch 'workspace-user' of github.com:computerfr33k/laradock into workspace-user
2016-07-27 02:56:59 -05:00
Eric Pfeiffer
20adc9ca13
accidentally forgot to set INSTALL_NODE back to false.
2016-07-27 02:56:48 -05:00
Eric Pfeiffer
dd9855d411
Update README.md
2016-07-27 02:49:43 -05:00
Eric Pfeiffer
17e252a436
add non-root user for workspace container.
2016-07-27 02:43:38 -05:00
Mahmoud Zalt
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
Mahmoud Zalt
2ba3060564
update the readme: switch to php 5.5
2016-07-27 05:44:36 +03:00
Mahmoud Zalt
5612874b78
Merge pull request #187 from LaraDock/faster-builds
...
Faster builds
2016-07-27 05:30:30 +03:00
Mahmoud Zalt
10af217349
update workspace build version
2016-07-27 04:39:54 +03:00
Mahmoud Zalt
e65f0dceba
add docker build version to the base image
2016-07-27 04:34:45 +03:00
Mahmoud Zalt
c792a780ee
use laradock php-fpm base images
...
to speed up the build time
2016-07-27 04:22:31 +03:00
Mahmoud Zalt
2d1c1586f5
use laradock workspace base image
...
to speed up the build time
2016-07-27 04:22:20 +03:00
Mahmoud Zalt
5bb3d3b6a8
rename PHP-FPM Dockerfile5 to Dockerfile56
2016-07-27 03:57:32 +03:00
Mahmoud Zalt
b1ec5b8d6f
Merge pull request #186 from computerfr33k/caddy
...
Update Caddyfile
2016-07-27 02:09:59 +03:00
Mahmoud Zalt
6e07061deb
Merge pull request #184 from computerfr33k/nginx-alpine
...
Nginx alpine image
2016-07-27 02:09:00 +03:00
Eric Pfeiffer
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
Eric Pfeiffer
e4f6cec536
fix nginx to actually log to files.
2016-07-26 12:53:26 -05:00
Eric Pfeiffer
e6cf30e7ba
re-added www-data user for nginx. log to stdout.
2016-07-26 12:41:52 -05:00
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
