From 48665f73809bedda717123b984f6e40eb1ba51bb Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Thu, 7 Aug 2025 16:52:08 -0400 Subject: [PATCH] provison uid added --- ANSIBLE/templates/composers/A000001/docker-compose.yml | 3 ++- ANSIBLE/templates/composers/A000002/docker-compose.yml | 3 ++- ANSIBLE/templates/composers/A000003/docker-compose.yml | 1 + ANSIBLE/templates/composers/A000004/docker-compose.yml | 1 + ANSIBLE/templates/composers/A000005/docker-compose.yml | 1 + app/Controllers/Home.php | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml index 77c0555..3c37ada 100644 --- a/ANSIBLE/templates/composers/A000001/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml @@ -9,7 +9,8 @@ services: volumes: - ./writable:/var/www/html/writable:Z - ./apache_log:/var/log/apache2:Z -# environment: + environment: + - PROVISION_UID=PROVISION_UID # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/ANSIBLE/templates/composers/A000002/docker-compose.yml b/ANSIBLE/templates/composers/A000002/docker-compose.yml index 77c0555..3c37ada 100644 --- a/ANSIBLE/templates/composers/A000002/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml @@ -9,7 +9,8 @@ services: volumes: - ./writable:/var/www/html/writable:Z - ./apache_log:/var/log/apache2:Z -# environment: + environment: + - PROVISION_UID=PROVISION_UID # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/ANSIBLE/templates/composers/A000003/docker-compose.yml b/ANSIBLE/templates/composers/A000003/docker-compose.yml index 3ad4361..1868845 100644 --- a/ANSIBLE/templates/composers/A000003/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000003/docker-compose.yml @@ -13,6 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME + PROVISION_UID: PROVISION_UID networks: - wpsite diff --git a/ANSIBLE/templates/composers/A000004/docker-compose.yml b/ANSIBLE/templates/composers/A000004/docker-compose.yml index 7051ad1..d8fe8b6 100644 --- a/ANSIBLE/templates/composers/A000004/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000004/docker-compose.yml @@ -13,6 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME + PROVISION_UID: PROVISION_UID networks: - wpsite diff --git a/ANSIBLE/templates/composers/A000005/docker-compose.yml b/ANSIBLE/templates/composers/A000005/docker-compose.yml index 6c5b5f5..4dad92a 100644 --- a/ANSIBLE/templates/composers/A000005/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000005/docker-compose.yml @@ -13,6 +13,7 @@ services: WORDPRESS_DB_USER: CNT_DB_NAME WORDPRESS_DB_PASSWORD: CNT_DB_PASS WORDPRESS_DB_NAME: CNT_DB_NAME + PROVISION_UID: PROVISION_UID networks: - wpsite diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 22af7dc..4606583 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -52,7 +52,7 @@ class Home extends BaseController $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents); - + $composer_template_contents = str_replace("PROVISION_UID", $provisionUID, $composer_template_contents); //Save to the specific path $destination_composer_path = $ansible_folder."/parts/".$provisionUID."/docker-compose.yml"; $composerFile = fopen( $destination_composer_path, "w") or die("Unable to open file!");