Merge branch 'make-module-lean'

Author: patternhelloworld

.env.example.real renamed to .env.example

@@ -1,6 +1,4 @@
 HOST_IP=host.docker.internal
-APP_ENV=real
-
 # You must type your exposed formal URL or IP such as https://test.com
 # Please provide your URL in the following format: <--http or https-->://<--your-ip--> (Replace "your-ip" with your IP address or domain name. Make sure it is in the form of IPv4 or a domain and can be accessed externally. Specify whether it is an HTTP or HTTPS connection, e.g., http:// or https://)
 APP_URL=
@@ -51,22 +49,24 @@ APP_HEALTH_CHECK_PATH=xxx
 BAD_APP_HEALTH_CHECK_PATTERN=xxx
 GOOD_APP_HEALTH_CHECK_PATTERN=xxx
 
-# This is for environment variables for docker-compose-app-${app_env}.
+# This is for environment variables for docker-compose-app.
 DOCKER_COMPOSE_ENVIRONMENT={}
 DOCKER_BUILD_ARGS={}
 DOCKER_BUILD_LABELS=[]
+# EX. --platform linux/amd64
+DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=
 DOCKER_BUILD_SHA_INSERT_GIT_ROOT=
 
-# This is overwritten on docker-compose-${project_name}-${app_env}.yml
-DOCKER_COMPOSE_REAL_SELECTIVE_VOLUMES=[]
-# This is added on docker-compose-${project_name}-nginx.yml
+# This is overwritten on docker-compose-${project_name}.yml
+DOCKER_COMPOSE_SELECTIVE_VOLUMES=[]
+# This is added on docker-orchestration-${project_name}-nginx.yml
 DOCKER_COMPOSE_NGINX_SELECTIVE_VOLUMES=["./shared/nginx-error-logs:/var/log/nginx"]
 # Check if the host folder or file exists
 DOCKER_COMPOSE_HOST_VOLUME_CHECK=false
 
 NGINX_CLIENT_MAX_BODY_SIZE=50M
 
-# Format : docker-compose-${project_name}-${app_env}-original-ready.yml
+# Format : docker-compose-${project_name}-original-ready.yml
 USE_MY_OWN_APP_YML=false
 
 SKIP_BUILDING_APP_IMAGE=false

.env.java.real renamed to .env.example.java

@@ -1,6 +1,5 @@
 # IMPORTANT - mac : docker.for.mac.localhost OR check IP. / win : host.docker.internal OR you can just type your host IP.
 HOST_IP=host.docker.internal
-APP_ENV=real
 
 APP_URL=http://localhost:18200
 
@@ -43,15 +42,17 @@
 GOOD_APP_HEALTH_CHECK_PATTERN=production
 
 
-# This is for environment variables for docker-compose-app-${app_env}.
+# This is for environment variables for docker-compose-app.
 DOCKER_COMPOSE_ENVIRONMENT={"TZ":"Asia/Seoul"}
 # This goes with "docker build ... in the 'run.sh' script file", and the command always contain "HOST_IP" and "APP_ENV" above.
 # docker exec -it CONTAINER_NAME cat /var/log/env_build_args.log
-DOCKER_BUILD_ARGS={"DOCKER_BUILDKIT":"1","PROJECT_ROOT_IN_CONTAINER":"/var/www/server/spring-sample-h-auth","APP_ENV":"production"}
+DOCKER_BUILD_ARGS={"DOCKER_BUILDKIT":"1","PROJECT_ROOT_IN_CONTAINER":"/var/www/server/spring-sample-h-auth","FILE_STORAGE_ROOT_IN_CONTAINER":"/var/www/files","APP_ENV":"production"}
 DOCKER_BUILD_LABELS=["foo=happy","bar=sad"]
+# For Mac like, EX.  DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=--platform linux/amd64
+DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=--platform linux/amd64
 DOCKER_BUILD_SHA_INSERT_GIT_ROOT=
 
-DOCKER_COMPOSE_REAL_SELECTIVE_VOLUMES=["./samples/spring-sample-h-auth/logs:/var/www/files"]
+DOCKER_COMPOSE_SELECTIVE_VOLUMES=["./samples/spring-sample-h-auth/logs:/var/www/files"]
 DOCKER_COMPOSE_NGINX_SELECTIVE_VOLUMES=["./shared/nginx-error-logs:/var/log/nginx"]
 DOCKER_COMPOSE_HOST_VOLUME_CHECK=false
 

.env.java.real.commercial.ssl.sample renamed to .env.example.java.commercial.ssl.sample

@@ -1,5 +1,4 @@
 HOST_IP=host.docker.internal
-APP_ENV=real
 
 APP_URL=https://localhost:8300
 
@@ -42,16 +41,18 @@ BAD_APP_HEALTH_CHECK_PATTERN=xxxxxxx
 GOOD_APP_HEALTH_CHECK_PATTERN=production
 
 
-# This is for environment variables for docker-compose-app-${app_env}.
+# This is for environment variables for docker-compose-app.
 DOCKER_COMPOSE_ENVIRONMENT={"TZ":"Asia/Seoul"}
 # This goes with "docker build ... in the 'run.sh' script file", and the command always contain "HOST_IP" and "APP_ENV" above.
 # 2) ''/var/web/project/spring-sample-h-auth' is here as well
 DOCKER_BUILD_ARGS={"DOCKER_BUILDKIT":"1","PROJECT_ROOT_IN_CONTAINER":"/var/www/server/spring-sample-h-auth","FILE_STORAGE_ROOT_IN_CONTAINER":"/var/www/files","JVM_XMS":"2048","JVM_XMX":"4096"}
 DOCKER_BUILD_LABELS=["foo.mylabel=happy","bar.mylabel=happy"]
+# EX. --platform linux/amd64
+DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=
 DOCKER_BUILD_SHA_INSERT_GIT_ROOT=/var/www/server/spring-sample-h-auth
 
 # 3) ''/var/web/project/spring-sample-h-auth' is here as well. The thing is you should locate 'application.properties', 'logback-spring.xml', 'yourdomain.com.jks' on the './src/main/resource' folder.
-DOCKER_COMPOSE_REAL_SELECTIVE_VOLUMES=["/var/web/files/spring-sample-h-auth:/var/www/files","/var/web/project/spring-sample-h-auth/src/main/resources:/var/www/server/spring-sample-h-auth/src/main/resources"]
+DOCKER_COMPOSE_SELECTIVE_VOLUMES=["/var/web/files/spring-sample-h-auth:/var/www/files","/var/web/project/spring-sample-h-auth/src/main/resources:/var/www/server/spring-sample-h-auth/src/main/resources"]
 DOCKER_COMPOSE_NGINX_SELECTIVE_VOLUMES=["/var/web/files/nginx/spring-sample-h-auth/logs:/var/log/nginx"]
 DOCKER_COMPOSE_HOST_VOLUME_CHECK=false
 

.env.example.local

@@ -1,6 +1,5 @@
 # IMPORTANT - mac : docker.for.mac.localhost OR check IP. / win : host.docker.internal OR you can just type your host IP.
 HOST_IP=host.docker.internal
-APP_ENV=local
 
 APP_URL=http://localhost:13000
 
@@ -41,14 +40,17 @@ APP_HEALTH_CHECK_PATH=v1/docs
 BAD_APP_HEALTH_CHECK_PATTERN=xxxxxxx
 GOOD_APP_HEALTH_CHECK_PATTERN=docs
 
-# This is for environment variables for docker-compose-app-${app_env}.
+# This is for environment variables for docker-compose-app.
 DOCKER_COMPOSE_ENVIRONMENT={"MONGODB_URL":"mongodb://host.docker.internal:27017/node-boilerplate","NODE_ENV":"development"}
 DOCKER_BUILD_ARGS={}
 DOCKER_BUILD_LABELS=["foo=happy","bar=sad"]
+# EX. --platform linux/amd64
+DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=
 DOCKER_BUILD_SHA_INSERT_GIT_ROOT=
 
 DOCKER_COMPOSE_NGINX_SELECTIVE_VOLUMES=[]
 DOCKER_COMPOSE_HOST_VOLUME_CHECK=false
+DOCKER_COMPOSE_SELECTIVE_VOLUMES=[]
 
 NGINX_CLIENT_MAX_BODY_SIZE=50M
 

.env.node.local renamed to .env.example.node

@@ -1,6 +1,5 @@
 # IMPORTANT - mac : docker.for.mac.localhost OR check IP. / win : host.docker.internal OR you can just type your host IP.
 HOST_IP=host.docker.internal
-APP_ENV=real
 
 # I recommend you should type your exposed formal URL or IP such as https://test.com for the test of 'check_availability_out_of_container' in the script 'run.sh'
 APP_URL=https://localhost:8081
@@ -43,18 +42,20 @@
 GOOD_APP_HEALTH_CHECK_PATTERN=UP
 
 
-# This is for environment variables for docker-compose-app-${app_env}.
+# This is for environment variables for docker-compose-app.
 DOCKER_COMPOSE_ENVIRONMENT={"XDEBUG_CONFIG":"idekey=IDE_DEBUG","PHP_IDE_CONFIG":"serverName=laravel-crud-boilerplate"}
 # This goes with "docker build ... in the 'run.sh' script file", and the command always contain "HOST_IP" and "APP_ENV" above.
 # docker exec -it CONTAINER_NAME cat /var/log/env_build_args.log
 DOCKER_BUILD_ARGS={"SAMPLE":"YAHOO","SAMPLE2":"YAHOO2","shared_volume_group_id":"1351","shared_volume_group_name":"laravel-shared-volume-group"}
 DOCKER_BUILD_LABELS=["foo=happy","bar=sad"]
+# EX. --platform linux/amd64
+DOCKER_BUILD_ADDITIONAL_RAW_PARAMS=
 # Your Git's commit SHA will be added as a label to DOCKER_BUILD_LABELS when your container is built.
 DOCKER_BUILD_SHA_INSERT_GIT_ROOT=
 
 # In the case of "REAL," the project is not synchronized in its entirety. The source codes that are required for only production are injected.
-# For SSL, the host folder is recommended to be './.docker/ssl' to be synchronized with 'docker-compose-nginx-original.yml'
-DOCKER_COMPOSE_REAL_SELECTIVE_VOLUMES=["./shared/app-error-logs:/var/www/app/storage/logs","./.docker/ssl:/etc/apache2/ssl"]
+# For SSL, the host folder is recommended to be './.docker/ssl' to be synchronized with 'docker-orchestration-app-nginx-original.yml'
+DOCKER_COMPOSE_SELECTIVE_VOLUMES=["./shared/app-error-logs:/var/www/app/storage/logs","./.docker/ssl:/etc/apache2/ssl"]
 DOCKER_COMPOSE_NGINX_SELECTIVE_VOLUMES=["./shared/nginx-error-logs:/var/log/nginx"]
 DOCKER_COMPOSE_HOST_VOLUME_CHECK=false