Compare commits

..

3 Commits

Author SHA1 Message Date
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
3 changed files with 67 additions and 27 deletions

View File

@ -19,7 +19,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
- [Intro](#Intro)
- [Features](#features)
- [Supported Containers](#Supported-Containers)
- [Supported Software's](#Supported-Containers)
- [What is Docker](#what-is-docker)
- [What is Laravel](#what-is-laravel)
- [Why Docker not Vagrant](#why-docker-not-vagrant)
@ -93,25 +93,31 @@ docker-compose up nginx mysql redis
<a name="Supported-Containers"></a>
### Supported Containers
### Supported Software's (Containers)
- PHP-FPM
- NGINX
- HHVM
- **Database Engines:**
- MySQL
- PostgreSQL
- MariaDB
- MongoDB
- Neo4j
- **Cache Engines:**
- Redis
- Memcached
- **PHP Servers:**
- NGINX
- Apache2
- Caddy
- Beanstalkd
- Beanstalkd Console
- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
- **PHP Compilers:**
- PHP-FPM
- HHVM
- **Message Queueing Systems:**
- Beanstalkd (+ Beanstalkd Console)
- **Tools:**
- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
>If you can't find your container, build it yourself and add it to this list. Contributions are welcomed :)
>If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :)
@ -209,9 +215,9 @@ git clone https://github.com/LaraDock/laradock.git
docker-compose up -d nginx mysql
```
You can select your own combination of container form this list:
You can select your own combination of Containers form the list below:
`nginx`, `hhvm` ,`mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `php-fpm`.
`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
**Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.

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

@ -51,6 +51,23 @@ services:
links:
- php-fpm
### Apache Server Container ##################################
apache2:
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: