Merge branch 'develop'

Author: constup

doc/dev/globals.adoc

@@ -91,15 +91,18 @@ contains your application
 
 |===
 
-== Language or technology
+== Project
 
 |===
-|variable |type |origin |description
+|variable |type |description
 
 |`projectinit_language`
 |enum (`php`, `node`)
-|`ask_language`
 |Language or technology enum.
+
+|`projectinit_project_type`
+|enum (`composer`, `symfony`, `nestjs`)
+|Project type.
 |===
 
 === PHP
@@ -111,10 +114,6 @@ contains your application
 |0/1 flag
 |Flag for using global or local Composer.
 
-|`projectinit_php_project_type`
-|enum (`composer`, `symfony`)
-|Project type.
-
 |`projectinit_is_composer_initialized`
 |0/1 flag
 |Flag to determine whether `comoser.json` is present.
@@ -168,10 +167,6 @@ contains your application
 |===
 |variable |type |description
 
-|`projectinit_node_project_type`
-|enum(`nestjs`)
-|Project type.
-
 |`projectinit_node_package_manager`
 |enum(`npm`, `yarn`, `pnpm`)
 |Package manager. Applied if the project type supports it.

src/container/docker/dev.sh

@@ -4,6 +4,6 @@ build_dev() {
   echo ""
   echo "Building Dev container..."
   cd "${project_root_dir}" || exit 1
-  docker compose -f compose_dev.yaml build
+  docker compose -f compose_dev.yaml --env-file .env.docker build
   echo "  Dev container built..."
 }

src/container/docker/dot_env_docker/docker_dot_env.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+add_user_and_group_ids() {
+  if [ ! -f "${project_root_dir}/.env.docker" ]; then
+    touch "${project_root_dir}/.env.docker"
+  fi
+  local user_id
+  local group_id
+  user_id=$(id -u)
+  group_id=$(id -g)
+  echo "PROJECTINIT_UID=${user_id}" >> "${project_root_dir}/.env.docker"
+  echo "PROJECTINIT_GID=${group_id}" >> "${project_root_dir}/.env.docker"
+}

src/container/docker/installer.sh

@@ -4,7 +4,8 @@ build_installer() {
   echo ""
   echo "Building Installer container..."
   cd "${project_root_dir}" || exit 1;
-  docker compose up --build
+  docker compose --env-file "${project_root_dir}/.env.docker" build --no-cache
+  docker compose --env-file "${project_root_dir}/.env.docker" up
   echo "  Installer container built..."
 }
 

src/git/generic_gitignore/generic.gitignore

@@ -62,6 +62,8 @@ compose_secrets/
 ## Symfony
 .env.local.php
 .env.*.local
+## Docker
+.env.docker
 
 # Temporary files and runtime
 ## Symfony

src/info_print.sh

@@ -26,9 +26,9 @@ print_git_block() {
   echo "| User name: ${projectinit_git_user_name}"
   echo "| User email: ${projectinit_git_user_email}"
   if [ "${projectinit_use_projectinit_gitignore}" -eq 1 ]; then
-    echo "| ProjectInit's .gitignore will be used."
+    echo "| ProjectInit's .gitignore is used."
   else
-    echo "| Your project's default .gitignore will be used."
+    echo "| Your project's default .gitignore is used."
   fi
   echo "|---------------------------------------------------------------------"
 }
@@ -75,8 +75,8 @@ print_php_tech_stack() {
       echo "| Composer: globally installed composer"
     fi
   fi
-  echo "| Project type: ${projectinit_php_project_type}"
-  case $projectinit_php_project_type in
+  echo "| Project type: ${projectinit_project_type}"
+  case $projectinit_project_type in
     "composer" )
       echo "| Composer library name: ${projectinit_composer_library_name}"
       ;;
@@ -94,25 +94,25 @@ print_php_tech_stack() {
   echo "| PHPUnit version: ${projectinit_phpunit_version}"
   if [ ! "$projectinit_phpunit_version" = "symfony/test-pack" ]; then
     if [ "$projectinit_use_projectinit_phpunit_dist" -eq 0 ]; then
-      echo "| Default phpunit.dist.xml will be used"
+      echo "| Default phpunit.dist.xml is used"
     else
-      echo "| ProjectInit's phpunit.dist.xml will be used"
+      echo "| ProjectInit's phpunit.dist.xml is used"
     fi
   else
       echo "| Symfony Test Pack was used. Configure phpunit.dist.xml manually"
   fi
   echo "| CS Fixer: PHP CS Fixer"
   if [ "$projectinit_use_projectinit_phpcsfixer_dist" -eq 0 ]; then
-    echo "| Default .php-cs-fixer.dist.php will be used"
+    echo "| Default .php-cs-fixer.dist.php is used"
   else
-    echo "| ProjectInit's .php-cs-fixer.dist.php will be used"
+    echo "| ProjectInit's .php-cs-fixer.dist.php is used"
   fi
 }
 
 print_node_tech_stack() {
-  echo "| Project type: ${projectinit_node_project_type}"
+  echo "| Project type: ${projectinit_project_type}"
   echo "| Package manager: ${projectinit_node_package_manager}"
-  case $projectinit_node_project_type in
+  case $projectinit_project_type in
     "nestjs" )
       echo "| NestJS version: ${projectinit_nestjs_version}"
       ;;

src/language/node/flow.sh

@@ -11,7 +11,7 @@ run_node_flow() {
 }
 
 run_node_docker_flow() {
-  case $projectinit_node_project_type in
+  case $projectinit_project_type in
     "nestjs" )
       # shellcheck source=./nestjs/flow.sh
       source "${tool_dir}/src/language/node/nestjs/flow.sh"

src/language/node/nestjs/container/docker/compose/v1/template/dev

@@ -2,6 +2,9 @@ services:
     ~~~service name~~~:
         container_name: ~~~container name~~~
         build:
+            args:
+              PROJECTINIT_UID: ${PROJECTINIT_UID}
+              PROJECTINIT_GID: ${PROJECTINIT_GID}
             context: ./
             dockerfile: Dockerfile_dev
         image: ~~~image name~~~

src/language/node/nestjs/container/docker/compose/v1/template/installer

@@ -2,6 +2,9 @@ services:
     ~~~service name~~~:
         container_name: ~~~container name~~~
         build:
+            args:
+              PROJECTINIT_UID: ${PROJECTINIT_UID}
+              PROJECTINIT_GID: ${PROJECTINIT_GID}
             context: ./
             dockerfile: Dockerfile
         image: ~~~image name~~~

src/language/node/nestjs/container/docker/compose/v1/template/prod

@@ -10,6 +10,4 @@ services:
             - "~~~host port~~~:3000"
         environment:
             - APP_ENV=prod
-            - NODE_ENV=production
-        volumes:
-            - ./:/usr/src/app
+            - NODE_ENV=production