feat: reduce env effects on build, logs

johnnymillergh · Dec 10, 2020 · 982ff20 · 982ff20
1 parent e37654e
commit 982ff20
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
 !**/src/test/**
-logs-*
+logs/
 .DS_Store
 HELP.md
 nohup.out

diff --git a/api-portal/pom.xml b/api-portal/pom.xml
@@ -51,14 +51,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>

diff --git a/api-portal/src/main/resources/configuration/logback/logback-base.xml b/api-portal/src/main/resources/configuration/logback/logback-base.xml
@@ -10,28 +10,29 @@
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 
     <!-- Log Render Configuration -->
-    <property name="PROJECT_ARTIFACT_Id"
-              value="api-portal"/>
+    <property name="PROJECT_ARTIFACT_Id" value="api-portal"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
     <property name="FILE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+    <!-- Log home is nothing related with Spring profiles or environments -->
+    <property name="LOG_HOME" value="logs"/>
 
     <!-- Log for Multi Environment Configuration -->
     <springProfile name="development-local">
-        <property name="LOG_HOME" value="logs-dev_loc"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_loc"/>
     </springProfile>
     <springProfile name="development-docker">
-        <property name="LOG_HOME" value="logs-dev_dkr"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_dkr"/>
     </springProfile>
     <springProfile name="test">
-        <property name="LOG_HOME" value="logs-test"/>
+        <property name="LOG_FILE_SUFFIX" value="-test"/>
     </springProfile>
     <springProfile name="stage">
-        <property name="LOG_HOME" value="logs-stage"/>
+        <property name="LOG_FILE_SUFFIX" value="-stage"/>
     </springProfile>
     <springProfile name="production">
-        <property name="LOG_HOME" value="logs-prod"/>
+        <property name="LOG_FILE_SUFFIX" value="-prod"/>
     </springProfile>
 
     <!-- CONSOLE Log Configuration -->
@@ -59,7 +60,7 @@
         <!-- in particular if post-processing tools impose size limits on the log files. -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}${LOG_FILE_SUFFIX}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <!-- each file should be at most 5MB, keep 7 days worth of history, but at most 1GB -->
             <maxFileSize>5MB</maxFileSize>
             <maxHistory>7</maxHistory>

diff --git a/auth-center/pom.xml b/auth-center/pom.xml
@@ -49,14 +49,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>

diff --git a/auth-center/src/main/resources/configuration/logback/logback-base.xml b/auth-center/src/main/resources/configuration/logback/logback-base.xml
@@ -10,28 +10,29 @@
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 
     <!-- Log Render Configuration -->
-    <property name="PROJECT_ARTIFACT_Id"
-              value="auth-center"/>
+    <property name="PROJECT_ARTIFACT_Id" value="auth-center"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
     <property name="FILE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+    <!-- Log home is nothing related with Spring profiles or environments -->
+    <property name="LOG_HOME" value="logs"/>
 
     <!-- Log for Multi Environment Configuration -->
     <springProfile name="development-local">
-        <property name="LOG_HOME" value="logs-dev_loc"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_loc"/>
     </springProfile>
     <springProfile name="development-docker">
-        <property name="LOG_HOME" value="logs-dev_dkr"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_dkr"/>
     </springProfile>
     <springProfile name="test">
-        <property name="LOG_HOME" value="logs-test"/>
+        <property name="LOG_FILE_SUFFIX" value="-test"/>
     </springProfile>
     <springProfile name="stage">
-        <property name="LOG_HOME" value="logs-stage"/>
+        <property name="LOG_FILE_SUFFIX" value="-stage"/>
     </springProfile>
     <springProfile name="production">
-        <property name="LOG_HOME" value="logs-prod"/>
+        <property name="LOG_FILE_SUFFIX" value="-prod"/>
     </springProfile>
 
     <!-- CONSOLE Log Configuration -->
@@ -59,7 +60,7 @@
         <!-- in particular if post-processing tools impose size limits on the log files. -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}${LOG_FILE_SUFFIX}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <!-- each file should be at most 5MB, keep 7 days worth of history, but at most 1GB -->
             <maxFileSize>5MB</maxFileSize>
             <maxHistory>7</maxHistory>

diff --git a/exercise-mis/pom.xml b/exercise-mis/pom.xml
@@ -49,14 +49,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>

diff --git a/exercise-mis/src/main/resources/configuration/logback/logback-base.xml b/exercise-mis/src/main/resources/configuration/logback/logback-base.xml
@@ -10,28 +10,29 @@
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 
     <!-- Log Render Configuration -->
-    <property name="PROJECT_ARTIFACT_Id"
-              value="exercise-mis"/>
+    <property name="PROJECT_ARTIFACT_Id" value="exercise-mis"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
     <property name="FILE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+    <!-- Log home is nothing related with Spring profiles or environments -->
+    <property name="LOG_HOME" value="logs"/>
 
     <!-- Log for Multi Environment Configuration -->
     <springProfile name="development-local">
-        <property name="LOG_HOME" value="logs-dev_loc"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_loc"/>
     </springProfile>
     <springProfile name="development-docker">
-        <property name="LOG_HOME" value="logs-dev_dkr"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_dkr"/>
     </springProfile>
     <springProfile name="test">
-        <property name="LOG_HOME" value="logs-test"/>
+        <property name="LOG_FILE_SUFFIX" value="-test"/>
     </springProfile>
     <springProfile name="stage">
-        <property name="LOG_HOME" value="logs-stage"/>
+        <property name="LOG_FILE_SUFFIX" value="-stage"/>
     </springProfile>
     <springProfile name="production">
-        <property name="LOG_HOME" value="logs-prod"/>
+        <property name="LOG_FILE_SUFFIX" value="-prod"/>
     </springProfile>
 
     <!-- CONSOLE Log Configuration -->
@@ -59,7 +60,7 @@
         <!-- in particular if post-processing tools impose size limits on the log files. -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}${LOG_FILE_SUFFIX}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <!-- each file should be at most 5MB, keep 7 days worth of history, but at most 1GB -->
             <maxFileSize>5MB</maxFileSize>
             <maxHistory>7</maxHistory>

diff --git a/gateway/pom.xml b/gateway/pom.xml
@@ -53,14 +53,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>

diff --git a/gateway/src/main/resources/configuration/logback/logback-base.xml b/gateway/src/main/resources/configuration/logback/logback-base.xml
@@ -10,28 +10,29 @@
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 
     <!-- Log Render Configuration -->
-    <property name="PROJECT_ARTIFACT_Id"
-              value="gateway"/>
+    <property name="PROJECT_ARTIFACT_Id" value="gateway"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
     <property name="FILE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+    <!-- Log home is nothing related with Spring profiles or environments -->
+    <property name="LOG_HOME" value="logs"/>
 
     <!-- Log for Multi Environment Configuration -->
     <springProfile name="development-local">
-        <property name="LOG_HOME" value="logs-dev_loc"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_loc"/>
     </springProfile>
     <springProfile name="development-docker">
-        <property name="LOG_HOME" value="logs-dev_dkr"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_dkr"/>
     </springProfile>
     <springProfile name="test">
-        <property name="LOG_HOME" value="logs-test"/>
+        <property name="LOG_FILE_SUFFIX" value="-test"/>
     </springProfile>
     <springProfile name="stage">
-        <property name="LOG_HOME" value="logs-stage"/>
+        <property name="LOG_FILE_SUFFIX" value="-stage"/>
     </springProfile>
     <springProfile name="production">
-        <property name="LOG_HOME" value="logs-prod"/>
+        <property name="LOG_FILE_SUFFIX" value="-prod"/>
     </springProfile>
 
     <!-- CONSOLE Log Configuration -->
@@ -59,7 +60,7 @@
         <!-- in particular if post-processing tools impose size limits on the log files. -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}${LOG_FILE_SUFFIX}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <!-- each file should be at most 5MB, keep 7 days worth of history, but at most 1GB -->
             <maxFileSize>5MB</maxFileSize>
             <maxHistory>7</maxHistory>

diff --git a/muscle-mis/pom.xml b/muscle-mis/pom.xml
@@ -49,14 +49,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>

diff --git a/muscle-mis/src/main/resources/configuration/logback/logback-base.xml b/muscle-mis/src/main/resources/configuration/logback/logback-base.xml
@@ -10,28 +10,29 @@
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 
     <!-- Log Render Configuration -->
-    <property name="PROJECT_ARTIFACT_Id"
-              value="muscle-mis"/>
+    <property name="PROJECT_ARTIFACT_Id" value="muscle-mis"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(-){faint} %clr([%15.15t]){blue} %clr(%-48.48logger{48}){cyan} %clr(:){faint} %m%n%wex"/>
     <property name="FILE_LOG_PATTERN"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } - [%t] %-48.48logger{48} : %m%n%wex"/>
+    <!-- Log home is nothing related with Spring profiles or environments -->
+    <property name="LOG_HOME" value="logs"/>
 
     <!-- Log for Multi Environment Configuration -->
     <springProfile name="development-local">
-        <property name="LOG_HOME" value="logs-dev_loc"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_loc"/>
     </springProfile>
     <springProfile name="development-docker">
-        <property name="LOG_HOME" value="logs-dev_dkr"/>
+        <property name="LOG_FILE_SUFFIX" value="-dev_dkr"/>
     </springProfile>
     <springProfile name="test">
-        <property name="LOG_HOME" value="logs-test"/>
+        <property name="LOG_FILE_SUFFIX" value="-test"/>
     </springProfile>
     <springProfile name="stage">
-        <property name="LOG_HOME" value="logs-stage"/>
+        <property name="LOG_FILE_SUFFIX" value="-stage"/>
     </springProfile>
     <springProfile name="production">
-        <property name="LOG_HOME" value="logs-prod"/>
+        <property name="LOG_FILE_SUFFIX" value="-prod"/>
     </springProfile>
 
     <!-- CONSOLE Log Configuration -->
@@ -59,7 +60,7 @@
         <!-- in particular if post-processing tools impose size limits on the log files. -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${PROJECT_ARTIFACT_Id}${LOG_FILE_SUFFIX}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <!-- each file should be at most 5MB, keep 7 days worth of history, but at most 1GB -->
             <maxFileSize>5MB</maxFileSize>
             <maxHistory>7</maxHistory>

diff --git a/pom.xml b/pom.xml
@@ -146,7 +146,7 @@
     <!-- Build Settings -->
     <build>
         <!-- set the name of .jar file -->
-        <finalName>${project.artifactId}-${envAlias}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
 
         <plugins>
             <!-- The Versions Plugin updates the versions of components in the POM. -->

diff --git a/service-registry/pom.xml b/service-registry/pom.xml
@@ -49,14 +49,14 @@
                         <image>openjdk:11.0.7-jre-slim</image>
                     </from>
                     <to>
-                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}-${envAlias}</image>
+                        <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>
                         <tags>
                             <tag>${project.version}</tag>
                         </tags>
                     </to>
                     <container>
                         <!-- The root directory on the container where the app's contents are placed. -->
-                        <appRoot>/${project.artifactId}-${envAlias}</appRoot>
+                        <appRoot>/${project.artifactId}</appRoot>
                         <jvmFlags>
                             <jvmFlag>-Xmx256m</jvmFlag>
                         </jvmFlags>