more changes for domains and command consistency

Author: cmtickle

docker/nginx/m-hosts.conf

@@ -21,8 +21,8 @@ map $http_host $MAGE_RUN_CODE {
 map $http_host $PHP_HOSTM2 {
     hostnames;
 
-    eg-m2-opensource.local php81;
-    eg-m2-commerce.local php81;
+    eg-m2-opensource.loc php81;
+    eg-m2-commerce.loc php81;
     phpmyadmin.loc php82;
     docker-stack-ui.loc php82;
     titans.loc php81;

project/includes/_functions_m2.sh

@@ -13,7 +13,7 @@
 # Magento 2 needs certain directories to work properly.
 # Create them if they're missing.
 #######################################################
-required_dirs_create () {
+internal_required_dirs_create () {
     # Phase ths step should run at.
     if [ $START_PHASE -gt 1 ] ; then
         echo_info "[!!] Skipping M2 directory fixes ...";

project/includes/_functions_shared.sh

@@ -41,10 +41,10 @@ files    : Download the codebase, run any additional commands to get the code st
 database : Downloads a copy of the database and configuration then loads these into the correct container.
 install  : Any final tasks required to get make the codebase operational e.g. composer or bin/magento
 
-<start_phase> supported options :: [files, database, install, all]
+<start_phase> supported options ::
 
 setup:all       = file, database and install phase functions
-setup:database  = database and install phase functions
+setup:database  = database and install phase functions ONLY
 setup:install   = install phase functions ONLY
 
 <custom_function> supported options ::
@@ -125,8 +125,6 @@ internal_verify_auth_json () {
     if [ "${AUTH_JSON_IS_DEFAULT}" -ne 0 ]; then
       echo_error "Please add your credentials in $AUTH_JSON_FILE";
       exit 1;
-    else
-      echo_info "AUTH JSON IS FINE";
     fi
   fi
 }
@@ -319,9 +317,9 @@ IDE:vscode () {
   ####################################
   # Please add host entry.
   #
-  # VSCode will be available when the
-  # docker build service informs of the
-  # 0.0.0.0 URl being available on this URL.
+  # When the Docker build process states
+  # 0.0.0.0 URL is available, access:
+  # http://vscode.loc
   #
   # MAC/LINUX:
   # 127.0.0.1 vscode.loc
@@ -342,7 +340,7 @@ IDE:vscode () {
 #     $project_name
 #     $vmhost_name
 ######################################
-repository_clone () {
+repository:clone () {
     # Phase ths step should run at.
     if [ ${START_PHASE} -gt 1 ] ; then
         echo_warn "[!!] Skipping ${repo_type} clone ...";

project/m2_commerce

@@ -30,12 +30,12 @@ php_host='php81'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
 required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch7" "${php_host}" "${db_host}");
 composer_version="2";
 db_name='example_m2_commerce'; # unique name for this database
-vmhost_name='eg-m2-commerce.local'; # domain name for this project in local vm.
+vmhost_name='eg-m2-commerce.loc'; # domain name for this project in local vm.
 
 ####################################
 # FUNCTIONS SPECIFIC TO THIS INSTALL
 ####################################
-repository_clone () {
+repository:clone () {
     # Phase ths step should run at.
     if [ ${START_PHASE} -gt 1 ] ; then
         echo_warn "[!!] Skipping ${project_name} build ...";
@@ -84,8 +84,8 @@ internal_verify_required_containers_are_up;
 ############################
 
 recreate_database;
-repository_clone;
-required_dirs_create ;
+repository:clone;
+internal_required_dirs_create ;
 
 ## For Commerce, doing this rather than storing a DB and config as it was causing issues.
 bin/magento setup:install --base-url=https://${vmhost_name}/ \

project/m2_opensource

@@ -30,7 +30,7 @@ php_host='php81'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
 required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch7" "${php_host}" "${db_host}");
 composer_version="2";
 db_name='example_m2_opensource'; # unique name for this database
-vmhost_name='eg-m2-opensource.local'; # domain name for this project in local vm.
+vmhost_name='eg-m2-opensource.loc'; # domain name for this project in local vm.
 
 ##################################
 # INITIALISE THE VARIABLES/SCRIPT
@@ -42,8 +42,8 @@ internal_verify_required_containers_are_up;
 ############################
 # CALL THE SHARED FUNCTIONS.
 ############################
-repository_clone;
-required_dirs_create ;
+repository:clone;
+internal_required_dirs_create ;
 db:get;
 db:load;
 composer_config;

project/mage_titans

@@ -37,7 +37,7 @@ github_args='--depth 1';
 resources_storage='local'; # Where to access shared resources (see README.md), 'local' or 's3'
 db_host='mysql80'; # 'percona56' or 'percona57'
 php_host='php81'; # 'php56', 'php70', 'php72', 'php73' or 'php74'
-required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch716" "gitea" "kibana" "${php_host}" "${db_host}");
+required_containers=( "nginx" "rediscache" "redissession" "redisfullpage" "elasticsearch716" "gitea" "kibana" "lighthouse-server" "${php_host}" "${db_host}");
 composer_version="2";
 db_name='mage_titans'; # unique name for this database
 vmhost_name='titans.loc'; # domain name for this project in local vm.
@@ -119,8 +119,8 @@ internal_verify_required_containers_are_up;
 # CALL THE SHARED FUNCTIONS.
 ############################
 internal_setup_gitea;
-repository_clone;
-required_dirs_create ;
+repository:clone;
+internal_required_dirs_create ;
 db:get;
 db:load;
 composer_config;

project/phpmyadmin

@@ -52,7 +52,7 @@ custom_setup () {
 ############################
 # CALL THE SHARED FUNCTIONS.
 ############################
-repository_clone;
+repository:clone;
 composer_install;
 custom_setup;
 host_entry_display;

project/resources/eg-m2-opensource.loc/configurator/Configuration/global.yaml

@@ -1,10 +1,10 @@
 global:
   -
     path: web/unsecure/base_url
-    value: https://eg-m2-opensource.local/
+    value: https://eg-m2-opensource.loc/
   -
     path: web/secure/base_url
-    value: https://eg-m2-opensource.local/
+    value: https://eg-m2-opensource.loc/
   -
     path: dev/static/sign
     value: 0

project/resources/eg-m2-opensource.loc/env.php

@@ -119,7 +119,7 @@
         'translate' => 1
     ],
     'downloadable_domains' => [
-        'eg-m2-opensource.local'
+        'eg-m2-opensource.loc'
     ],
     'install' => [
         'date' => 'Wed, 06 Apr 2022 18:15:39 +0000'