diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml index 1603746..ab1539c 100644 --- a/ANSIBLE/templates/composers/A000001/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml @@ -1,7 +1,7 @@ services: website-WHAT_CONTAINER_NAME: container_name: WHAT_CONTAINER_NAME - image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0005a:latest + image: PROVISION_IMAGE_NAME_REPLACE pull_policy: always ports: - 'ALLOCATED_PORT:80' @@ -13,6 +13,7 @@ services: - PROVISION_UID=PROVISION_UID_REPLACE - TEMPLATE_NAME=TEMPLATE_NAME_REPLACE - SITE_CONTENTS_URL=http://10.10.10.101:14700/web/contents + - SITE_CONTACT_URL=http://10.10.10.101:14700/web/contacts # - 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 6d803af..ab1539c 100644 --- a/ANSIBLE/templates/composers/A000002/docker-compose.yml +++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml @@ -1,7 +1,7 @@ services: website-WHAT_CONTAINER_NAME: container_name: WHAT_CONTAINER_NAME - image: registry.chiefsoft.com/bweb/bweb-01-merms-pweb0006a:latest + image: PROVISION_IMAGE_NAME_REPLACE pull_policy: always ports: - 'ALLOCATED_PORT:80' @@ -13,6 +13,7 @@ services: - PROVISION_UID=PROVISION_UID_REPLACE - TEMPLATE_NAME=TEMPLATE_NAME_REPLACE - SITE_CONTENTS_URL=http://10.10.10.101:14700/web/contents + - SITE_CONTACT_URL=http://10.10.10.101:14700/web/contacts # - APACHE_RUN_USER=1000 # - APACHE_RUN_GROUP=1000 networks: diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index 5a1e305..45d05d3 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -180,6 +180,7 @@ class Provision extends BaseController $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_DATA", '172.16.4.96:3307', $composer_template_contents); $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents); + $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE","registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents); $templateRandom = 'P' . rand(1, 6); $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents); @@ -378,6 +379,8 @@ class Provision extends BaseController $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents); $composer_template_contents = str_replace("CNT_DB_DATA", '172.16.4.96:3307', $composer_template_contents); $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents); + $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE","registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents); + $templateRandom = 'P' . rand(1, 6); $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents); //Save to the specific path