Merge pull request #4 from vfalies/dev

Dev

Author: vfalies

.env .env.dist.env renamed to .env.dist

@@ -1,10 +1,10 @@
 MAILDEV_PORT=1080
 DBADMIN_PORT=9090
 WEB_PORT=80
-PHP_VERSION=7.2
+PHP_VERSION=7.2-fpm-alpine
 DB=mysql
 WEB_SERVER=nginx
-PROJECTS_PATH=./projects
+PROJECTS_PATH=/your/projects/directory/path
 MYSQL_ROOT_PASSWORD=root
 CACHE_SERVER=redis
 CACHE_PORT=6380

.gitignore

@@ -1,5 +1,10 @@
-projects/*
-!projects/phpinfo.php
-!projects/index.php
 conf/apache/vhosts/*
+!conf/apache/vhosts/default.conf
+!conf/apache/vhosts/envdev_home.conf
 conf/nginx/vhosts/*
+!conf/nginx/vhosts/default.conf
+!conf/nginx/vhosts/envdev_home.conf
+projects/*
+!projects/index.php
+!projects/phpinfo.php
+.env

CHANGELOG.md

@@ -1,11 +1,39 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1] - 2018-04-05
+
+### Added
+
+- Share git config & ssh keys
+- Add `envdev` vhost configuration for Apache & Nginx
+- Rename `projects` directory to `home`
+- Add ``.env.dist` configuration example
+- Add Makefile
+- Use current UID & GID in container
+- Add Make action "stop" to stop all containers
+- Add Make action "homepage" to open envdev.localhost in default browser
+
+### Changed
+
+- Rename conf/apache/vhost directory to conf/apache/vhosts
+- Update working directory for PHP container
+- Change PHP image
+- Refactoring Home page
+- Set docker-compose make action with detached mode
+
+### Deleted
+
+- Remove NodeJs container (already include in PHP image)
+
 ## [2.0] - 2017-12-20
+
 ### Added
+
 - Add cache stack : redis or memcached
 
 ### Changed
@@ -18,4 +46,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Remove Apigen container
 - Remove Deployer container
-- Remove bash_aliases file
+- Remove bash_aliases file

Makefile

@@ -0,0 +1,16 @@
+export USER_ID=$(shell id -u)
+export GROUP_ID=$(shell id -g)
+
+include .env
+
+servers:
+	docker-compose up -d --build --remove-orphans
+
+stop:
+	docker-compose down
+
+install:
+	docker-compose build --force-rm --no-cache && docker run --rm -v $(shell pwd):/var/www/html -u "$(USER_ID):$(GROUP_ID)" vfac/envdevphpbase:$(PHP_VERSION) sh -c "cd /var/www/html/home/envdev; composer update --lock"
+
+homepage:
+	x-www-browser envdev.localhost

README.md

@@ -1,8 +1,11 @@
+# EnvDev
+
 ## Environment composition
 
 This environment provies the following tools to develop in PHP :
 
 ### Core
+
 - [PHP](http://php.net)
 
 Available version :
@@ -17,7 +20,7 @@ PHP Stack run on Alpine version to keep a small size image.
 
 - Database
 
-Two different database are available : 
+Two different database are available :
 
     - [MySQL](https://www.mysql.com)
     - [MongoDB](https://www.mongodb.com)
@@ -53,7 +56,7 @@ All of them are in Alpine version
 
 - [MailDev](http://danfarrelly.nyc/MailDev) : SMTP Server + Web Interface for viewing and testing emails during development
 
-#### Composer 
+#### Composer
 
 - [Composer](https://getcomposer.org) : Dependency Manager for PHP
 
@@ -76,21 +79,31 @@ Image container : [`vfac/deployer`](https://hub.docker.com/r/vfac/deployer/)
 ## Requirements
 
 Two system dependencies are required :
+
 - Docker
 - Docker Compose
 
 ## Installation
 
+```shell
+git clone [email protected]:vfalies/EnvDev.git
 ```
-$ git clone [email protected]:vfalies/EnvDev.git
+
+Create a `.env` file to define your configuration.
+An example is available with `.env.dist` file.
+
+To install environment
+
+```shell
+make install
 ```
 
 ## Usage
 
 To start the environment, type the following command:
 
-```
-$ docker-compose up
+```shell
+make servers
 ```
 
 Several containers are created from `.env` configuration:
@@ -107,29 +120,35 @@ Several containers are created from `.env` configuration:
 
 `composer` is available through `php` container:
 
-```
+```shell
 docker exec php composer -v
 ```
 
 `node`, `npm` are available through `node` container:
 
-```
+```shell
 docker run --rm node node -v
 ```
 
-```
+```shell
 docker run --rm node npm -v
 ```
 
+To open default home page in browser
+
+```shell
+make home
+```
+
 ### Hosts
 
-You can add your own hosts file for all your projects. 
+You can add your own hosts file for all your projects.
 
-With NGinx 
+With NGinx
 
 In `conf/nginx/vhosts` directory, all your `yourhost.conf` file. A default host file is available for example : `/conf/nginx/vhosts/default.conf`.
 
-```
+```conf
 server {
 
     listen 80;
@@ -151,39 +170,41 @@ With Apache
 
 In `conf/apache/vhosts` directory, all your `yourhost.conf` file. A default host file is available for example : `/conf/apache/vhosts/default.conf`.
 
-```
+```conf
 <VirtualHost *:80>
     ServerName localhost
-    DocumentRoot /var/www/html
+    DocumentRoot /var/www/html/projects
 
-    <Directory /var/www/html>
+    <Directory /var/www/html/projects>
         Require all granted
     </Directory>
 
     <FilesMatch \.php$>
-    	SetHandler "proxy:fcgi://php:9000"
+        SetHandler "proxy:fcgi://php:9000"
     </FilesMatch>
 </VirtualHost>
 ```
 
 ## Configuration
 
-You can modify `.env` file to manage applications and tools.
+You can create `.env` file to manage applications and tools.
+An example is available with `.env.dist` file.
+
 The following versions, paths and ports can be configured :
 
 | Description | Variable name | Possible values | Default |
 |:-------------|:---------------:|:-----------------:|:---------:|
 | PHP Version | PHP_VERSION | `5.6`, `7.0`, `7.1`, `7.2` | `7.2` |
 | Database type | DB | `mariadb`, `mysql`, `mongodb` | `mysql` |
 | Cache server type | CACHE_SERVER | `redis`, `memcached` | `redis` |
-| Projects Path | PROJECTS_PATH | any | `./projects` |
+| Projects Path | PROJECTS_PATH | any | `/your/projects/directory/path` |
 | HTTP web port | WEB_PORT | any | `80` |
 | MailDev port | MAILDEV_PORT | any | `1080` |
 | PHPMyAdmin port | PHPMYADMIN_PORT | any | `9090` |
 | MongoExpress port | MONGOEXPRESS_PORT | any | `8081` |
 | Cache server port | CACHE_PORT | any | `6380` |
 
-If you access to the url `http://localhost` a page summarizes all projets and propose access link to PHPMyAdmin, MailDev and PHPInfo.
+If you access to the url `http://envdev.localhost` a page summarizes all projets and propose access link to PHPMyAdmin, MailDev and PHPInfo.
 
 ### Nginx configuration
 
@@ -195,9 +216,9 @@ Apache configuration file is available at `/conf/apache/httpd.conf` to custom th
 
 ### PHP configuration
 
-A custom php.ini file is available at `/conf/php/php.ini`. The default PHP configuration is with these options: 
+A custom php.ini file is available at `/conf/php/php.ini`. The default PHP configuration is with these options:
 
-```
+```conf
 date.timezone = Europe/Paris
 display_errors=1
 error_reporting=E_ALL

conf/apache/vhost/default.conf conf/apache/vhosts/default.confconf/apache/vhost/default.conf renamed to conf/apache/vhosts/default.conf

@@ -1,12 +1,12 @@
 <VirtualHost *:80>
     ServerName localhost
-    DocumentRoot /var/www/html
+    DocumentRoot /var/www/html/projects
 
-    <Directory /var/www/html>
+    <Directory /var/www/html/projects>
         Require all granted
     </Directory>
 
     <FilesMatch \.php$>
     	SetHandler "proxy:fcgi://php:9000"
     </FilesMatch>
-</VirtualHost>
+</VirtualHost> 

conf/apache/vhosts/envdev_home.conf

@@ -0,0 +1,17 @@
+<VirtualHost *:80>
+    ServerName envdev.localhost
+    ServerAlias envdev
+
+    DocumentRoot /var/www/html/envdev_home/envdev/public
+
+    <Directory "/var/www/html/envdev_home/envdev/public">
+          Options FollowSymLinks
+          AllowOverride All
+
+          Require all granted
+    </Directory>
+
+    <FilesMatch \.php$>
+    	SetHandler "proxy:fcgi://php:9000"
+    </FilesMatch>
+</VirtualHost>

conf/nginx/vhosts/default.conf

@@ -2,7 +2,7 @@ server {
 
     listen 80;
     server_name localhost;
-    root /var/www/html;
+    root /var/www/html/projects;
     index index.php index.html index.htm;
 
     location ~* \.PHP$ {

conf/nginx/vhosts/envdev_home.conf

@@ -0,0 +1,19 @@
+server {
+
+    listen 80;
+    server_name envdev.localhost envdev;
+    root /var/www/html/envdev_home/envdev/public;
+    index index.php index.html index.htm;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~* \.PHP$ {
+        fastcgi_index   index.php;
+        fastcgi_pass   php:9000;
+        include         fastcgi_params;
+        fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+    }
+
+}