* Add ability to define PHP application source directory (#47)

* Bump Traefik to 1.4.3 to incorporate traefik/traefik#2302 (enables proper X-Forwarded-Port for PHP frameworks depending on X-Forwarded* during URL generation e.g. Symfony with setTrustedProxies enabled)

Author: dkozickis

config/.env.blueprint

@@ -10,6 +10,19 @@
 
 ENV=local
 
+# |--------------------------------------------------------------------------
+# | Application directory
+# |--------------------------------------------------------------------------
+# |
+# | Application directory
+# |
+# | If your PHP application source is in other directory than 'app'.
+# | Change the value below.
+# | No trailing slash, relative to kickoff-docker root.
+# |
+
+DIR=app
+
 # |--------------------------------------------------------------------------
 # | Docker Sync
 # |--------------------------------------------------------------------------

docker-sync.blueprint.yml

@@ -5,7 +5,7 @@ options:
 
 syncs:
   {{ .EnvFiles.Config.ENV }}{{ .Values.Project.name }}_sync_app:
-    src: './app/'
+    src: './{{ .EnvFiles.Config.DIR }}/'
     sync_userid: ${UID}
     sync_strategy: {{ if eq "darwin" os }}'native_osx'{{ else }}'unison'{{ end }}
     sync_excludes: ['.idea']

modules/nginx/docker-compose.blueprint.yml

@@ -27,7 +27,7 @@ services:
       {{- if eq "true" .EnvFiles.Config.ENABLE_DOCKER_SYNC }}
       - {{ .EnvFiles.Config.ENV }}{{ .Values.Project.name }}_sync_app:/var/www/html:nocopy
       {{- else }}
-      - ../../app:/var/www/html:{{ if eq "darwin" os }}cached{{ else }}ro{{ end }}
+      - ../../{{ .EnvFiles.Config.DIR }}:/var/www/html:{{ if eq "darwin" os }}cached{{ else }}ro{{ end }}
       {{- end }}
       - ./conf.d/php-fpm.conf:/etc/nginx/conf.d/php-fpm.conf:ro
     {{- if eq true .Values.Modules.graylog.enable }}

modules/php-fpm/docker-compose.blueprint.yml

@@ -23,7 +23,7 @@ services:
       {{- if eq "true" .EnvFiles.Config.ENABLE_DOCKER_SYNC }}
       - {{ .EnvFiles.Config.ENV }}{{ .Values.Project.name }}_sync_app:/var/www/html:nocopy
       {{- else }}
-      - ../../app:/var/www/html:{{ if eq "darwin" os }}cached{{ else }}rw{{ end }}
+      - ../../{{ .EnvFiles.Config.DIR }}:/var/www/html:{{ if eq "darwin" os }}cached{{ else }}rw{{ end }}
       {{- end }}
       - ./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh:ro
       - ./conf.d/memory-limit.ini:/usr/local/etc/php/conf.d/memory-limit.ini:ro

modules/traefik/docker-compose.blueprint.yml

@@ -6,7 +6,7 @@ services:
 
 
   proxy:
-    image: traefik:1.4.0-alpine
+    image: traefik:1.4.3-alpine
     container_name: kickoff-proxy
     restart: {{ if and (ne "local" .EnvFiles.Config.ENV) (eq false .Values.Modules.graylog.enable) }}unless-stopped{{ else }}"no"{{ end }}
     command: --docker --logLevel={{ .EnvFiles.Config.TRAEFIK_LOG_LEVEL }}