Adapt domain name and SSL certs for Mac OS and Windows setups

Made some small adapaptions so the project does work when using
docker-machine.

- Use a local default snakeoil ssl cert: Not all systems have their
  snakeoil certs at /etc/ssl/certs/ssl-cert-snakeoil.pem
- Changed the domain name from "127.0.0.1" to "dockerized-magento.local" in
  order to allow using the project with docker-machine on Mac OS and
  Windows
- Removed the Vagrant file because docker-machine makes this obsolete
- Add instructions for setting a hosts file entry (for Linux, Mac OS
  and Windows).
- Add instructions for using docker-machine-nfs for better performance
  on Mac OS
- Use more standard images to speed up the build
- Add local volumes for logs and data
- Update README section with stats action

Author: andreaskoch

Diff for: .gitignore

@@ -4,3 +4,4 @@ composer.phar
 vendor
 db
 .vagrant
+.DS_Store

Diff for: README.md

@@ -4,14 +4,59 @@ A dockerized version of "Magento Community Edition 1.9.x"
 
 ## Requirements
 
-Before you start you should install
+If you are on Linux you should install
 
 - [docker](http://docs.docker.com/compose/install/#install-docker) and
 - [docker-compose (formerly known as fig)](http://docs.docker.com/compose/install/#install-compose)
 
-or
+If you are running on [Mac OS](https://docs.docker.com/engine/installation/mac/) or [Windows](https://docs.docker.com/engine/installation/windows/) you can install the [Docker Toolbox](https://docs.docker.com/engine/installation/mac/) which contains docker, docker-compose and docker-machine.
 
-You can use [vagrant](Vagrantfile) if you are on Windows or a Mac
+## Preparations
+
+The web-server will be bound to your local ports 80 and 443. In order to access the shop you must add a hosts file entry for `dockerized-magento.local`.
+
+### For Linux Users
+
+In order to access the shop you must add the domain name "dockerized-magento.local" to your hosts file (`/etc/hosts`).
+If you are using docker **natively** you can use this command:
+
+```bash
+sudo su
+echo "127.0.0.1    dockerized-magento.local" >> /etc/hosts
+```
+
+### For Mac Users
+
+If you are using [docker-machine](https://github.com/docker/machine) you need to use the IP address of your virtual machine running docker:
+
+```bash
+docker-machine ls
+docker-machine ip <name-of-your-docker-machine>
+```
+
+```bash
+echo "192.168.99.100    dockerized-magento.local" >> /etc/hosts
+```
+
+**docker-machine performance**
+
+For faster sync between your host system and the docker machine image I recommend that you activate NFS support for virtualbox: [github.com/adlogix/docker-machine-nfs](https://github.com/adlogix/docker-machine-nfs)
+
+```bash
+docker-machine create --driver virtualbox nfsbox
+docker-machine-nfs nfsbox
+```
+
+And to fix issues with filesystem permissions you can modify your NFS exports configuration:
+
+1. open `/etc/exports` and replace `-mapall=$uid:$gid` with `-maproot=0`
+2. `sudo nfsd restart`
+
+Thanks to [René Penner](https://github.com/renepenner/magento-docker-boilerplate) for figuring that out.
+
+### For Windows Users
+
+I suppose it will work on Windows, but I have not tested it. And I suspect that the performance will not be great due to the slow file-sharing protocol between the Windows hosts and the VirtualBox VM.
 
 ## Installation
 
@@ -20,7 +65,7 @@ You can use [vagrant](Vagrantfile) if you are on Windows or a Mac
 3. Start the projects using `./magento start` or `docker-compose up`
 
 ```bash
-git clone https://github.com/andreaskoch/dockerized-magento.git && cd dockerized-magento
+git clone https://github.com/andreaskoch/dockerized-magento.local.git && cd dockerized-magento.local
 ./magento start
 ```
 
@@ -35,19 +80,19 @@ During the first start of the project **docker-compose** will
 	- import the sample database
 	- and finally reindex all indices
 
-Once the installation is fininished the installer will print the URL and the credentials for the backend to the installer log:
+Once the installation is finished the installer will print the URL and the credentials for the backend to the installer log:
 
 ```
 ...
-installer_1     | Frontend: http://127.0.0.1/
-installer_1     | Backend: http://127.0.0.1/admin
+installer_1     | Frontend: http://dockerized-magento.local/
+installer_1     | Backend: http://dockerized-magento.local/admin
 installer_1     |  - Username: admin
 installer_1     |  - Password: password123
 ```
 
-[![Animation: Installation and first projec start](documentation/installation-and-first-start-animation.gif)](https://s3.amazonaws.com/andreaskoch/dockerized-magento/installation/Dockerized-Magento-Installation-Linux-no-sound.mp4)
+[![Animation: Installation and first project start](documentation/installation-and-first-start-animation.gif)](https://s3.amazonaws.com/andreaskoch/dockerized-magento.local/installation/Dockerized-Magento-Installation-Linux-no-sound.mp4)
 
-**Note**: The build process and the installation process will take a while if you start the project for the first time. After thats finished starting and stoping the project will be a matter of seconds.
+**Note**: The build process and the installation process will take a while if you start the project for the first time. After that, starting and stoping the project will be a matter of seconds.
 
 ## Usage
 
@@ -63,12 +108,13 @@ You can control the project using the built-in `magento`-script which is basical
 - **stop**: Stops all docker containers
 - **restart**: Restarts all docker containers and flushes the cache
 - **status**: Prints the status of all docker containers
+- **stats**: Displays live resource usage statistics of all containers
 - **magerun**: Executes magerun in the magento root directory
 - **composer**: Executes composer in the magento root directory
 - **enter**: Enters the bash of a given container type (e.g. php, mysql, ...)
 - **destroy**: Stops all containers and removes all data
 
-**Note**: The `magento`-script is just a small wrapper arround `docker-compose`. You can just use [docker-compose](https://docs.docker.com/compose/) directly.
+**Note**: The `magento`-script is just a small wrapper around `docker-compose`. You can just use [docker-compose](https://docs.docker.com/compose/) directly.
 
 ## Components
 
@@ -89,7 +135,7 @@ The dockerized Magento project consists of the following components:
 
 The component-diagram should give you a general idea* how all components of the "dockerized Magento" project are connected:
 
-[![Dockerized Magento: Component Diagram](documentation/dockerized-magento-component-diagram.png)](documentation/dockerized-magento-component-diagram.svg)
+[![Dockerized Magento: Component Diagram](documentation/dockerized-magento.local-component-diagram.png)](documentation/dockerized-magento.local-component-diagram.svg)
 
 `*` The diagram is just an attempt to visualize the dependencies between the different components. You can get the complete picture by studying the docker-compose file:  [docker-compose.yml](docker-compose.yml)
 
@@ -109,37 +155,18 @@ If you have started the shop before you must **repeat the installation process**
 
 ### Changing the domain name
 
-I set the default domain name to `127.0.0.1` so you can access the shop without modifying your hosts-file. But you can simply change that by replacing `127.0.0.1` with `your-domain.tld`.
-
-The domain name used as the **base url** for the Magento installation is referenced three times in the docker-compose.yml:
+I set the default domain name to `dockerized-magento.local`. To change the domain name replace `dockerized-magento.local` with `your-domain.tld` in the `docker-compose.yml` file:
 
 ```yaml
 installer:
   environment:
-    DOMAIN: 127.0.0.1
-nginx:
-  domainname: 127.0.0.1
-  environment:
-    DOMAIN: 127.0.0.1
+    DOMAIN: dockerized-magento.local
 ```
 
-1. In the `DOMAIN` environment variable for the **installer**
-2. In `domainname` attribute of the **nginx** container
-3. In the `DOMAIN` environment variable for the **nginx** container
-
-### Using a different SSL certiticate
-
-By default I chose the snakeoil dummy certificate that is installed on Ubuntu systems. If you are on a different system or want to use a real SSL certificate for your shop you can change the environment variables of the **nginx** container:
+### Using a different SSL certificate
 
-- `SSL_CERTIFICATE_PATH` for the path to *.pem or *.crt file
-- `SSL_CERTIFICATE_KEY_PATH` for the path to the *.key file
-
-```yaml
-nginx:
-  environment:
-    SSL_CERTIFICATE_PATH: <path-to-your-certificate>
-    SSL_CERTIFICATE_KEY_PATH: <path-to-your-certificates-private-key>
-```
+By default I chose a dummy certificate ([config/ssl/cert.pem](config/ssl/cert.pem)).
+If you want to use a different certificate you can just override the key and cert with your own certificates.
 
 ### Adapt Magento Installation Parameters
 
@@ -150,7 +177,7 @@ If you want to install Magento using your own admin-user or change the password,
 - `ADMIN_LASTNAME`: The last name of the admin user
 - `ADMIN_PASSWORD`: The password for the admin user
 - `ADMIN_EMAIL`: The email address of the admin user (**Note**: Make sure it has a valid syntax. Otherwise Magento will not install.)
-- `ADMIN_FRONTNAME`: The name of the backend route (e.g. `http://127.0.0.1/admin`)
+- `ADMIN_FRONTNAME`: The name of the backend route (e.g. `http://dockerized-magento.local/admin`)
 
 ```yaml
 installer:
@@ -166,7 +193,7 @@ installer:
 
 ### Change the MySQL Root User Password
 
-I chose a very weak passwords for the MySQL root-user. You can change it by modifiying the respective environment variables for the **mysql-container** ... and **installer** because otherwise the installation will fail:
+I chose a very weak passwords for the MySQL root-user. You can change it by modifying the respective environment variables for the **mysql-container** ... and **installer** because otherwise the installation will fail:
 
 ```yaml
 installer:

Diff for: Vagrantfile

@@ -0,0 +1,10 @@
+# Disable Basic Auth for the API
+location ~ ^/index\.php/api/ {
+    rewrite .* /index.php break;
+
+    auth_basic                      off;
+    expires                         off;
+
+    include                         /etc/nginx/includes/magento-fastcgi;
+    include                         /etc/nginx/custom-includes/*-fastcgi;
+}

Diff for: config/nginx/custom-locations/custom.location

@@ -0,0 +1,16 @@
+fastcgi_split_path_info         ^(.+\.php)(/.+)$;
+
+fastcgi_pass                    php:9000;
+fastcgi_index                   index.php;
+
+include fastcgi_params;
+fastcgi_param                   SCRIPT_FILENAME $document_root$fastcgi_script_name;
+
+fastcgi_param                   MAGENTO_ROOT /var/www/html/web;
+fastcgi_param                   REMOTE_ADDR $remote_addr;
+
+fastcgi_buffer_size             1024k;
+fastcgi_buffers                 500 512k;
+fastcgi_connect_timeout         1200;
+fastcgi_send_timeout            1200;
+fastcgi_read_timeout            1200;

Diff for: config/nginx/includes/api

@@ -0,0 +1,9 @@
+    gzip                on;
+    gzip_min_length     1000;
+    gzip_proxied        any;
+    gzip_types          text/plain
+                        application/xml
+                        text/css
+                        text/js
+                        application/javascript
+                        application/x-javascript;

Diff for: config/nginx/includes/fastcgi

@@ -0,0 +1,6 @@
+rewrite ^/minify/([0-9]+)(/.*.(js|css))$ /lib/minify/m.php?f=$2&d=$1 last;
+rewrite ^/skin/m/([0-9]+)(/.*.(js|css))$ /lib/minify/m.php?f=$2&d=$1 last;
+
+location /lib/minify/ {
+    allow all;
+}

Diff for: config/nginx/includes/gzip

@@ -0,0 +1,24 @@
+user                    nginx;
+worker_processes        4;
+pid                     /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    log_format          main  '$remote_addr - $remote_user [$time_local] "$request" '
+                              '$status $body_bytes_sent "$http_referer" '
+                              '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log          /var/log/nginx/access.log main;
+    error_log           /var/log/nginx/error.log warn;
+
+    sendfile            on;
+    keepalive_timeout   65;
+
+    include             /etc/nginx/conf.d/*;
+}

Diff for: config/nginx/includes/minify

@@ -0,0 +1,67 @@
+server {
+    listen                      80 default_server;
+    listen                      443 default_server ssl;
+
+    ssl_certificate             /etc/nginx/ssl/cert.pem;
+    ssl_certificate_key         /etc/nginx/ssl/cert.key;
+
+    client_max_body_size        10M;
+
+    root                        /var/www/html/web;
+    index                       index.php;
+
+    # Handle images directly
+    location ~* ^.+\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf)$ {
+        root /var/www/html/web;
+    }
+
+    location / {
+        index index.html index.php;
+        try_files $uri $uri/ @handler;
+        expires 30d;
+    }
+
+    location ^~ /app/                       { deny all; }
+    location ^~ /includes/                  { deny all; }
+    location ^~ /lib/                       { deny all; }
+    location ^~ /media/downloadable/        { deny all; }
+    location ^~ /pkginfo/                   { deny all; }
+    location ^~ /report/config.xml          { deny all; }
+    location ^~ /var/                       { deny all; }
+    location ^~ /downloader/                { deny all; }
+    location /var/export/                   { deny all; }
+
+    # Custom Locations
+    include                     /etc/nginx/custom-locations/*.location;
+
+    location ~ ^/cron\.(sh|php) {
+        return 404;
+    }
+
+    location  /. {
+        return 404;
+    }
+
+    location @handler {
+        rewrite / /index.php;
+    }
+
+    location ~ \.php/ {
+        rewrite ^(.*\.php)/ $1 last;
+    }
+
+
+    # All PHP Requests
+    location ~ \.php$ {
+
+        ## Catch 404s that try_files miss
+        if (!-e $request_filename) {
+            rewrite / /index.php last;
+        }
+
+        include  /etc/nginx/includes/fastcgi;
+    }
+
+    include                     /etc/nginx/includes/minify;
+    include                     /etc/nginx/includes/gzip;
+}

Diff for: config/nginx/nginx.conf

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICoTCCAYkCAQAwXDELMAkGA1UEBhMCREUxEzARBgNVBAgTClNvbWUtU3RhdGUx
+GzAZBgNVBAoTEmRvY2tlcml6ZWQtbWFnZW50bzEbMBkGA1UEAxMSZG9ja2VyaXpl
+ZC1tYWdlbnRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH4Ev70Y
+b4d6MJnmtDXysKMDvDq19vR5jAMtnNzrbbKnbBss0BtZfTA35OoKHJCkY2lFfVdF
+OW1Mw41srEtAcokAnEuO4XJ8rCrRdzCfLrvfIFDWlkg9RkdGtVm55L2UEOIY2j7Y
+GhcqSPXGEjfhiVom5YL5DVa5JCT0GyKj3aAN6eu9Bc9cuFcngJNgBzJAl/XKDktT
+VnsJOuG7hDPzD9ICcJos8Mm7cuocqK9l5Mw5EaCK+uqGBSZtkqf0v32iqXSjEQS0
+WyxHdC8WIGTH6DKZf1F+QgVZUv0MNCQlSvNzmKK7BVLhbpOxoRiwsT5Mps32Q409
+nccBzmwnByMTGwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBACChDtUrxlfFNRbw
+vm6DwHSpBAZgee+5IoqXko76DpWTQzXTxxmZAY6IfvkJHPHlxkdYhojuEmPGfgWs
+EzQVrj/Ld8YeBleROtFSL6911dc2n41sFCTZUhZ2aP/RtzO/IX/fBhs/zAtGvKn/
+Z7gke5cD5D6/xhqIv7wngkxI4w54oS7y83ei1ZRpKqVhf6VM9vcmTPWXxPvYo2Bx
+HyvLLz8D7AEQ7kXKkv+YRFK1l11ca1GuGSf9I0jSJ3n43Gxt6Sk1MwrP0PyQBJh8
++hbgr4neVAtFAXghC7Ky29qIrd8RxBWra1892gCzh4ie9nfHgQYgR4qhz5ebfS56
+PubY9ck=
+-----END CERTIFICATE REQUEST-----