Merge branch 'release/0.1.1'

Author: adam-paterson

CHANGELOG.md

@@ -4,6 +4,24 @@ All Notable changes to `KickAssDocker` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## 0.1.1 - 2017-02-17
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nginx vhost template
+- `docker-compose.yml` example
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
 ## 0.1.0 - 2017-02-16
 
 ### Added

docker-compose-build.yml

@@ -3,8 +3,14 @@ services:
   web:
     build:
       context: nginx/
+    environment:
+      - VIRTUAL_HOST=dev.kickasscommerce.com
+      - VIRTUAL_PORT=80
+      - HTTPS_METHOD=noredirect
     ports:
       - 80
+    links:
+      - fpm
     volumes_from:
       - appdata
 

docker-compose.yml

@@ -1,13 +1,16 @@
 version: "2"
 services:
   web:
-    image: kickasscommerce/kickass-nginx:latest
+    image: kickasscommerce/kickass-nginx:1.9
+    hostname: dev.kickasscommerce.com
     environment:
-      - VIRTUAL_HOST=kickasscommerce.docker
+      - VIRTUAL_HOST=dev.kickasscommerce.com
       - VIRTUAL_PORT=80
       - HTTPS_METHOD=noredirect
+      - CERT_NAME=default
     ports:
       - 80
+      - 443
     links:
       - fpm
     volumes_from:

nginx/etc/vhost.conf

@@ -4,14 +4,14 @@ upstream fastcgi_backend {
 
 server {
    listen 80;
-   listen [::]:80 ipv6only=on;
+
+   server_name localhost;
 
    set $APP_ROOT !APP_ROOT!;
 
-   root $APP_ROOT;
+   root $APP_ROOT/public;
    index index.php index.html index.htm;
-
-   server_name localhost;
+   autoindex off;
 
    location / {
       try_files $uri $uri/ /index.php?$query_string;