Merge branch 'develop'

Author: constup

src/database/database_flow.sh

@@ -16,8 +16,8 @@ setup_database_docker_compose_dev() {
     "mysql" )
       projectinit_compose_has_root_volumes=1
       projectinit_compose_has_secrets=1
-      # shellcheck source=../database/mysql/v1/mysql.sh
-      source "${tool_dir}/src/database/mysql/v1/mysql.sh"
+      # shellcheck source=mysql/container/docker/v1/mysql.sh
+      source "${tool_dir}/src/database/mysql/container/docker/v1/mysql.sh"
       setup_mysql_docker_compose_dev
       setup_mysql_my_cnf_dev
       setup_mysql_dev_entrypoint
@@ -26,8 +26,8 @@ setup_database_docker_compose_dev() {
     "percona" )
       projectinit_compose_has_root_volumes=1
       projectinit_compose_has_secrets=1
-      # shellcheck source=../database/percona/v1/percona.sh
-      source "${tool_dir}/src/database/percona/v1/percona.sh"
+      # shellcheck source=percona/container/docker/v1/percona.sh
+      source "${tool_dir}/src/database/percona/container/docker/v1/percona.sh"
       setup_percona_docker_compose_dev
       setup_percona_my_cnf_dev
       setup_percona_dev_entrypoint
@@ -36,8 +36,8 @@ setup_database_docker_compose_dev() {
     "mariadb" )
       projectinit_compose_has_root_volumes=1
       projectinit_compose_has_secrets=1
-      # shellcheck source=../database/mariadb/v1/mariadb.sh
-      source "${tool_dir}/src/database/mariadb/v1/mariadb.sh"
+      # shellcheck source=mariadb/container/docker/v1/mariadb.sh
+      source "${tool_dir}/src/database/mariadb/container/docker/v1/mariadb.sh"
       setup_mariadb_docker_compose_dev
       setup_mariadb_my_cnf_dev
       setup_mariadb_dev_entrypoint
@@ -63,24 +63,24 @@ setup_database_docker_compose_prod() {
       setup_pgsql_prod_dockerfile
       ;;
     "mysql" )
-      # shellcheck source=../database/mysql/v1/mysql.sh
-      source "${tool_dir}/src/database/mysql/v1/mysql.sh"
+      # shellcheck source=mysql/container/docker/v1/mysql.sh
+      source "${tool_dir}/src/database/mysql/container/docker/v1/mysql.sh"
       setup_mysql_docker_compose_prod
       setup_mysql_my_cnf_prod
       setup_mysql_prod_entrypoint
       setup_mysql_prod_dockerfile
       ;;
     "percona" )
-      # shellcheck source=../database/percona/v1/percona.sh
-      source "${tool_dir}/src/database/percona/v1/percona.sh"
+      # shellcheck source=percona/container/docker/v1/percona.sh
+      source "${tool_dir}/src/database/percona/container/docker/v1/percona.sh"
       setup_percona_docker_compose_prod
       setup_percona_my_cnf_prod
       setup_percona_prod_entrypoint
       setup_percona_prod_dockerfile
       ;;
     "mariadb" )
-      # shellcheck source=../database/mariadb/v1/mariadb.sh
-      source "${tool_dir}/src/database/mariadb/v1/mariadb.sh"
+      # shellcheck source=mariadb/container/docker/v1/mariadb.sh
+      source "${tool_dir}/src/database/mariadb/container/docker/v1/mariadb.sh"
       setup_mariadb_docker_compose_prod
       setup_mariadb_my_cnf_prod
       setup_mariadb_prod_entrypoint

src/database/mariadb/v1/mariadb.sh …e/mariadb/container/docker/v1/mariadb.shsrc/database/mariadb/v1/mariadb.sh renamed to src/database/mariadb/container/docker/v1/mariadb.sh src/database/mariadb/v1/mariadb.sh renamed to src/database/mariadb/container/docker/v1/mariadb.sh

@@ -4,7 +4,7 @@ setup_mariadb_docker_compose_dev() {
   local target_file
   target_file="${project_root_dir}/compose.yaml"
 
-  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/mariadb/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/mariadb/container/docker/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
   perl -pi -e "s/~~~database service name~~~/${projectinit_database_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~database container name~~~/${projectinit_database_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~database host port~~~/${projectinit_database_host_port}/g" "${target_file}"
@@ -25,7 +25,7 @@ setup_mariadb_docker_compose_dev() {
     mkdir -p "${project_root_dir}/projectinit_docker/dev/mariadb/docker-entrypoint-initdb.d"
   fi
 
-  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/mariadb/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/mariadb/container/docker/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
 }
 
 setup_mariadb_docker_compose_prod() {
@@ -35,7 +35,7 @@ setup_mariadb_docker_compose_prod() {
     mkdir "${project_root_dir}/projectinit_docker/prod"
   fi
 
-  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/mariadb/v1/template/prod" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/mariadb/container/docker/v1/template/prod" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
   perl -pi -e "s/~~~database service name~~~/${projectinit_database_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~database container name~~~/${projectinit_database_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~database host port~~~/${projectinit_database_host_port}/g" "${target_file}"
@@ -46,22 +46,22 @@ setup_mariadb_docker_compose_prod() {
     mkdir -p "${project_root_dir}/projectinit_docker/prod/mariadb/docker-entrypoint-initdb.d"
   fi
 
-  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/mariadb/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/mariadb/container/docker/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
 }
 
 setup_mariadb_dev_dockerfile() {
   local target_file
   target_file="${project_root_dir}/projectinit_docker/dev/mariadb/Dockerfile"
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/dockerfile/dev" "${target_file}"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/dockerfile/dev" "${target_file}"
   perl -pi -e "s/~~~database server version~~~/${projectinit_database_version}/g" "${target_file}"
 }
 
 setup_mariadb_prod_dockerfile() {
   local target_file
   target_file="${project_root_dir}/projectinit_docker/prod/mariadb/Dockerfile"
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/dockerfile/prod" "${target_file}"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/dockerfile/prod" "${target_file}"
   perl -pi -e "s/~~~database server version~~~/${projectinit_database_version}/g" "${target_file}"
 }
 
@@ -70,7 +70,7 @@ setup_mariadb_my_cnf_dev() {
     mkdir -p "${project_root_dir}/projectinit_docker/dev/mariadb/etc/mysql/conf.d"
   fi
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/my_cnf/dev_my.cnf" "${project_root_dir}/projectinit_docker/dev/mariadb/etc/mysql/conf.d/my.cnf"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/my_cnf/dev_my.cnf" "${project_root_dir}/projectinit_docker/dev/mariadb/etc/mysql/conf.d/my.cnf"
   chmod 644 "${project_root_dir}/projectinit_docker/dev/mariadb/etc/mysql/conf.d/my.cnf"
 }
 
@@ -79,7 +79,7 @@ setup_mariadb_my_cnf_prod() {
     mkdir -p "${project_root_dir}/projectinit_docker/prod/mariadb/etc/mysql/conf.d"
   fi
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/my_cnf/prod_my.cnf" "${project_root_dir}/projectinit_docker/prod/mariadb/etc/mysql/conf.d/my.cnf"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/my_cnf/prod_my.cnf" "${project_root_dir}/projectinit_docker/prod/mariadb/etc/mysql/conf.d/my.cnf"
   chmod 644 "${project_root_dir}/projectinit_docker/prod/mariadb/etc/mysql/conf.d/my.cnf"
 }
 
@@ -88,13 +88,13 @@ setup_mariadb_dev_entrypoint() {
     mkdir -p "${project_root_dir}/projectinit_docker/dev/mariadb"
   fi
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/entrypoint/dev.sh" "${project_root_dir}/projectinit_docker/dev/mariadb/entrypoint.sh"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/entrypoint/dev.sh" "${project_root_dir}/projectinit_docker/dev/mariadb/entrypoint.sh"
 }
 
 setup_mariadb_prod_entrypoint() {
   if [ ! -d "${project_root_dir}/projectinit_docker/prod/mariadb" ]; then
     mkdir -p "${project_root_dir}/projectinit_docker/prod/mariadb"
   fi
 
-  cp -f "${tool_dir}/src/database/mariadb/v1/template/entrypoint/prod.sh" "${project_root_dir}/projectinit_docker/prod/mariadb/entrypoint.sh"
+  cp -f "${tool_dir}/src/database/mariadb/container/docker/v1/template/entrypoint/prod.sh" "${project_root_dir}/projectinit_docker/prod/mariadb/entrypoint.sh"
 }