Merge branch 'develop'

constup · constup · commit 891a9cec4ee6 · 2025-03-28T01:02:01.000+01:00
diff --git a/src/database/database_flow.sh b/src/database/database_flow.sh
@@ -7,8 +7,8 @@ setup_database_docker_compose_dev() {
       perl -i -ne 'print unless /~~~database creation and migration~~~/;' "${project_root_dir}/start.sh"
       ;;
     "pgsql" )
-      # shellcheck source=../database/pgsql/v1/pqsql.sh
-      source "${tool_dir}/src/database/pgsql/v1/pqsql.sh"
+      # shellcheck source=pgsql/container/docker/v1/pqsql.sh
+      source "${tool_dir}/src/database/pgsql/container/docker/v1/pqsql.sh"
       setup_pgsql_docker_compose_dev
       ;;
     "mysql" )
@@ -55,8 +55,8 @@ setup_database_docker_compose_prod() {
       perl -i -ne 'print unless /~~~database creation and migration~~~/;' "${project_root_dir}/projectinit_docker/prod/start.sh"
       ;;
     "pgsql" )
-      # shellcheck source=../database/pgsql/v1/pqsql.sh
-      source "${tool_dir}/src/database/pgsql/v1/pqsql.sh"
+      # shellcheck source=pgsql/container/docker/v1/pqsql.sh
+      source "${tool_dir}/src/database/pgsql/container/docker/v1/pqsql.sh"
       setup_pgsql_docker_compose_prod
       ;;
     "mysql" )
diff --git a/src/database/mariadb/v1/template/dev b/src/database/mariadb/v1/template/dev
@@ -14,10 +14,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      timeout: 10s
-      start_period: 1m
     secrets:
       - mariadb_database
       - mariadb_user
diff --git a/src/database/mariadb/v1/template/dockerfile/dev b/src/database/mariadb/v1/template/dockerfile/dev
@@ -5,4 +5,6 @@ ENV MARIADB_MYSQL_LOCALHOST_USER=1
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/mariadb/etc/mysql/conf.d/*.cnf /etc/mysql/conf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/mariadb/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD healthcheck.sh --connect --innodb_initialized
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/mariadb/v1/template/dockerfile/prod b/src/database/mariadb/v1/template/dockerfile/prod
@@ -5,4 +5,6 @@ ENV MARIADB_MYSQL_LOCALHOST_USER=1
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/mariadb/etc/mysql/conf.d/*.cnf /etc/mysql/conf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/mariadb/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD healthcheck.sh --connect --innodb_initialized
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/mariadb/v1/template/prod b/src/database/mariadb/v1/template/prod
@@ -14,10 +14,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      timeout: 10s
-      start_period: 1m
     secrets:
       - mariadb_database
       - mariadb_user
diff --git a/src/database/mysql/v1/template/dev b/src/database/mysql/v1/template/dev
@@ -14,10 +14,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: mysqladmin ping --default-auth=caching_sha2_password -h 127.0.0.1 -u \$(cat \$MYSQL_USER_FILE) -p\$(cat \$MYSQL_PASSWORD_FILE) --silent
-      timeout: 10s
-      start_period: 1m
     entrypoint: ["/bin/bash", "/entrypoint.sh"]
     secrets:
       - mysql_database
diff --git a/src/database/mysql/v1/template/dockerfile/dev b/src/database/mysql/v1/template/dockerfile/dev
@@ -3,4 +3,11 @@ FROM mysql:~~~database server version~~~
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/mysql/etc/mysql/conf.d/*.cnf /etc/mysql/conf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/mysql/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD mysqladmin ping \
+        --default-auth=caching_sha2_password \
+        -h 127.0.0.1 \
+        -u $(cat $MYSQL_USER_FILE) \
+        -p$(cat $MYSQL_PASSWORD_FILE) \
+        --silent
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/mysql/v1/template/dockerfile/prod b/src/database/mysql/v1/template/dockerfile/prod
@@ -3,4 +3,11 @@ FROM mysql:~~~database server version~~~
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/mysql/etc/mysql/conf.d/*.cnf /etc/mysql/conf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/mysql/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD mysqladmin ping \
+        --default-auth=caching_sha2_password \
+        -h 127.0.0.1 \
+        -u $(cat $MYSQL_USER_FILE) \
+        -p$(cat $MYSQL_PASSWORD_FILE) \
+        --silent
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/mysql/v1/template/prod b/src/database/mysql/v1/template/prod
@@ -14,10 +14,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: mysqladmin ping --default-auth=caching_sha2_password -h 127.0.0.1 -u \$(cat \$MYSQL_USER_FILE) -p\$(cat \$MYSQL_PASSWORD_FILE) --silent
-      timeout: 10s
-      start_period: 1m
     entrypoint: ["/bin/bash", "/entrypoint.sh"]
     secrets:
       - mysql_database
diff --git a/src/database/percona/v1/template/dev b/src/database/percona/v1/template/dev
@@ -15,10 +15,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: mysqladmin ping --default-auth=caching_sha2_password -h 127.0.0.1 -u \$(cat \$MYSQL_USER_FILE) -p\$(cat \$MYSQL_PASSWORD_FILE) --silent
-      timeout: 10s
-      start_period: 1m
     secrets:
       - mysql_database
       - mysql_user
diff --git a/src/database/percona/v1/template/dockerfile/dev b/src/database/percona/v1/template/dockerfile/dev
@@ -3,4 +3,11 @@ FROM percona:~~~database server version~~~
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/percona/etc/my.cnf.d/*.cnf /etc/my.cnf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/percona/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD mysqladmin ping \
+        --default-auth=caching_sha2_password \
+        -h 127.0.0.1 \
+        -u $(cat $MYSQL_USER_FILE) \
+        -p$(cat $MYSQL_PASSWORD_FILE) \
+        --silent
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/percona/v1/template/dockerfile/prod b/src/database/percona/v1/template/dockerfile/prod
@@ -3,4 +3,11 @@ FROM percona:~~~database server version~~~
 COPY --chown=mysql:mysql --chmod=644 ./projectinit_docker/dev/percona/etc/my.cnf.d/*.cnf /etc/my.cnf.d/
 COPY --chown=mysql:mysql ./projectinit_docker/dev/percona/entrypoint.sh /entrypoint.sh
 
+HEALTHCHECK --timeout=10s --start-period=1m \
+    CMD mysqladmin ping \
+        --default-auth=caching_sha2_password \
+        -h 127.0.0.1 \
+        -u $(cat $MYSQL_USER_FILE) \
+        -p$(cat $MYSQL_PASSWORD_FILE) \
+        --silent
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/src/database/percona/v1/template/prod b/src/database/percona/v1/template/prod
@@ -15,10 +15,6 @@
       - "~~~x plugin host port~~~:33060"
     volumes:
       - ~~~database service name~~~_volume:/var/lib/mysql
-    healthcheck:
-      test: mysqladmin ping --default-auth=caching_sha2_password -h 127.0.0.1 -u \$(cat \$MYSQL_USER_FILE) -p\$(cat \$MYSQL_PASSWORD_FILE) --silent
-      timeout: 10s
-      start_period: 1m
     secrets:
       - mysql_database
       - mysql_user
diff --git a/src/database/pgsql/container/docker/v1/pqsql.sh b/src/database/pgsql/container/docker/v1/pqsql.sh
@@ -4,7 +4,7 @@ setup_pgsql_docker_compose_dev() {
   local target_file
   target_file="${project_root_dir}/compose.yaml"
   
-  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/pgsql/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/pgsql/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 server version~~~/${projectinit_database_version}/g" "${target_file}"
@@ -19,7 +19,7 @@ setup_pgsql_docker_compose_dev() {
   touch "${project_root_dir}/compose_secrets/postgres_user.txt"
   echo "${projectinit_database_user}" >> "${project_root_dir}/compose_secrets/postgres_user.txt"
 
-  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/pgsql/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/pgsql/container/docker/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
 }
 
 setup_pgsql_docker_compose_prod() {
@@ -29,11 +29,11 @@ setup_pgsql_docker_compose_prod() {
     mkdir "${project_root_dir}/projectinit_docker/prod"
   fi
 
-  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/pgsql/v1/template/prod" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~database service~~~/$(<"${tool_dir}/src/database/pgsql/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 server version~~~/${projectinit_database_version}/g" "${target_file}"
   perl -pi -e "s/~~~database host port~~~/${projectinit_database_host_port}/g" "${target_file}"
 
-  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/pgsql/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~compose secrets~~~/$(<"${tool_dir}/src/database/pgsql/container/docker/v1/template/secrets" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
 }
diff --git a/src/database/pgsql/container/docker/v1/template/dev b/src/database/pgsql/container/docker/v1/template/dev
diff --git a/src/database/pgsql/container/docker/v1/template/prod b/src/database/pgsql/container/docker/v1/template/prod
diff --git a/src/database/pgsql/container/docker/v1/template/secrets b/src/database/pgsql/container/docker/v1/template/secrets
diff --git a/src/language/php/symfony/container/docker/compose/v1/compose.sh b/src/language/php/symfony/container/docker/compose/v1/compose.sh
@@ -24,8 +24,8 @@ setup_dev_compose() {
   setup_database_docker_compose_dev
 
   if [ "${projectinit_use_memcached}" -eq 1 ]; then
-    # shellcheck source=../../../../../../../tools/cache/memcached/v1/memcached.sh
-    source "${tool_dir}/src/tools/cache/memcached/v1/memcached.sh"
+    # shellcheck source=../../../../../../../tools/cache/memcached/container/docker/v1/memcached.sh
+    source "${tool_dir}/src/tools/cache/memcached/container/docker/v1/memcached.sh"
     setup_memcached_docker_compose_dev
   fi
 
@@ -56,8 +56,8 @@ setup_prod_compose() {
   setup_database_docker_compose_prod
 
   if [ "${projectinit_use_memcached}" -eq 1 ]; then
-    # shellcheck source=../../../../../../../tools/cache/memcached/v1/memcached.sh
-    source "${tool_dir}/src/tools/cache/memcached/v1/memcached.sh"
+    # shellcheck source=../../../../../../../tools/cache/memcached/container/docker/v1/memcached.sh
+    source "${tool_dir}/src/tools/cache/memcached/container/docker/v1/memcached.sh"
     setup_memcached_docker_compose_prod
   fi
 
diff --git a/src/language/php/symfony/container/docker/dockerfile/v1/dockerfile.sh b/src/language/php/symfony/container/docker/dockerfile/v1/dockerfile.sh
@@ -25,8 +25,8 @@ setup_dev_dockerfile() {
   source "${tool_dir}/src/database/database_flow.sh"
   setup_database_dockerfile_dev
 
-  # shellcheck source=../../../../../../../tools/cache/memcached/v1/memcached.sh
-  source "${tool_dir}/src/tools/cache/memcached/v1/memcached.sh"
+  # shellcheck source=../../../../../../../tools/cache/memcached/container/docker/v1/memcached.sh
+  source "${tool_dir}/src/tools/cache/memcached/container/docker/v1/memcached.sh"
   setup_memcached_dockerfile_dev
 
   perl -i -ne 'print unless /~~~php extension~~~/;' "${target_file}"
@@ -46,8 +46,8 @@ setup_prod_dockerfile() {
   source "${tool_dir}/src/database/database_flow.sh"
   setup_database_dockerfile_prod
 
-  # shellcheck source=../../../../../../../tools/cache/memcached/v1/memcached.sh
-  source "${tool_dir}/src/tools/cache/memcached/v1/memcached.sh"
+  # shellcheck source=../../../../../../../tools/cache/memcached/container/docker/v1/memcached.sh
+  source "${tool_dir}/src/tools/cache/memcached/container/docker/v1/memcached.sh"
   setup_memcached_dockerfile_prod
 
   perl -i -ne 'print unless /~~~php extension~~~/;' "${target_file}"
diff --git a/src/tools/cache/memcached/container/docker/v1/memcached.sh b/src/tools/cache/memcached/container/docker/v1/memcached.sh
@@ -4,7 +4,7 @@ setup_memcached_docker_compose_dev() {
   local target_file
   target_file="${project_root_dir}/compose.yaml"
 
-  perl -pi -e "s/~~~tools~~~/$(<"${tool_dir}/src/tools/cache/memcached/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~tools~~~/$(<"${tool_dir}/src/tools/cache/memcached/container/docker/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
   perl -pi -e "s/~~~memcached service name~~~/${projectinit_memcached_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~memcached version~~~/${projectinit_memcached_version}/g" "${target_file}"
   perl -pi -e "s/~~~memcached host port~~~/${projectinit_memcached_host_port}/g" "${target_file}"
@@ -18,7 +18,7 @@ setup_memcached_docker_compose_prod() {
     mkdir "${project_root_dir}/projectinit_docker/prod"
   fi
 
-  perl -pi -e "s/~~~tools~~~/$(<"${tool_dir}/src/tools/cache/memcached/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
+  perl -pi -e "s/~~~tools~~~/$(<"${tool_dir}/src/tools/cache/memcached/container/docker/v1/template/dev" perl -pe 's/([\/\& \t])/\\$1/g')/g" "${target_file}"
   perl -pi -e "s/~~~memcached service name~~~/${projectinit_memcached_service_name}/g" "${target_file}"
   perl -pi -e "s/~~~memcached version~~~/${projectinit_memcached_version}/g" "${target_file}"
   perl -pi -e "s/~~~memcached host port~~~/${projectinit_memcached_host_port}/g" "${target_file}"
diff --git a/src/tools/cache/memcached/container/docker/v1/template/dev b/src/tools/cache/memcached/container/docker/v1/template/dev
diff --git a/src/tools/cache/memcached/container/docker/v1/template/prod b/src/tools/cache/memcached/container/docker/v1/template/prod
