Restructure and cleaned up in preparation of new backup logic

roles/web-app-wordpress/templates/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM wordpress:{{applications | get_app_conf(application_id, 'version', True)}}
+FROM {{ wordpress_image }}:{{ wordpress_version }}
 
 # Install msmtp and update system
 RUN apt-get update && \

roles/web-app-wordpress/templates/docker-compose.yml.j2

@@ -1,8 +1,8 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
     {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: {{wordpress_custom_image}}
-    container_name: wordpress-application
+    image: {{ wordpress_custom_image }}
+    container_name: {{ wordpress_name }}
     build:
       context: .
     ports:
@@ -18,3 +18,4 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
+    name:   "{{ wordpress_volume }}"