Refactored docker rroles dto use new role docker-compose

roles/docker-wordpress/handlers/main.yml

@@ -3,13 +3,6 @@
   command:
     cmd: docker build --no-cache -t custom_wordpress .
     chdir: "{{docker_compose_instance_directory}}"
-  environment:
-    COMPOSE_HTTP_TIMEOUT: 600
-    DOCKER_CLIENT_TIMEOUT: 600
-- name: recreate wordpress
-  command:
-    cmd: docker-compose -p wordpress up -d --force-recreate
-    chdir: "{{docker_compose_instance_directory}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600

roles/docker-wordpress/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- nginx-docker-reverse-proxy
+- docker-compose

roles/docker-wordpress/tasks/main.yml

@@ -19,7 +19,7 @@
     src: upload.ini.j2
     dest: "{{docker_compose_instance_directory}}upload.ini"
   notify: 
-    - recreate wordpress
+    - docker compose project setup
     - rebuild wordpress container
 
 - name: "Transfering Dockerfile to {{docker_compose_instance_directory}}"
@@ -27,9 +27,9 @@
     src: Dockerfile
     dest: "{{docker_compose_instance_directory}}Dockerfile"
   notify:
-    - recreate wordpress
+    - docker compose project setup
     - rebuild wordpress container
 
 - name: "add docker-compose.yml to {{docker_compose_instance_directory}}"
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
-  notify: recreate wordpress
+  notify: docker compose project setup

roles/docker-wordpress/vars/main.yml

@@ -1,7 +1,7 @@
-docker_compose_instance_directory: "{{path_docker_compose_instances}}wordpress/"
-wordpress_max_upload_size: "64M"
-database_instance:  	"wordpress"
-database_host:      	"database"
-database_databasename:  "{{database_instance}}"
-database_username:  	"{{database_instance}}"
-database_password:  	"{{wordpress_database_password}}"
+docker_compose_project_name:  	    "wordpress"
+docker_compose_instance_directory:  "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
+wordpress_max_upload_size:          "64M"
+database_host:      	              "database"
+database_databasename:              "{{docker_compose_project_name}}"
+database_username:  	              "{{docker_compose_project_name}}"
+database_password:  	              "{{wordpress_database_password}}"