Merge pull request #12872 from dashevchenko/edqs-to-tb-edqs

Renamed edqs service to tb-edqs

docker/docker-compose.edqs.volumes.yml

@@ -19,10 +19,10 @@ version: '3.0'
 services:
   tb-edqs-1:
     volumes:
-      - tb-edqs-log-volume:/var/log/edqs
+      - tb-edqs-log-volume:/var/log/tb-edqs
   tb-edqs-2:
     volumes:
-      - tb-edqs-log-volume:/var/log/edqs
+      - tb-edqs-log-volume:/var/log/tb-edqs
 
 volumes:
   tb-edqs-log-volume:

docker/docker-compose.edqs.yml

@@ -33,10 +33,10 @@ services:
     restart: always
     image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
     env_file:
-      - edqs.env
+      - tb-edqs.env
     volumes:
-      - ./edqs/conf:/usr/share/edqs/conf
+      - ./tb-edqs/conf:/usr/share/tb-edqs/conf
-      - ./edqs/log:/var/log/edqs
+      - ./tb-edqs/log:/var/log/tb-edqs
     ports:
       - "8080"
     depends_on:
@@ -46,10 +46,10 @@ services:
     restart: always
     image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
     env_file:
-      - edqs.env
+      - tb-edqs.env
     volumes:
-      - ./edqs/conf:/usr/share/edqs/conf
+      - ./tb-edqs/conf:/usr/share/tb-edqs/conf
-      - ./edqs/log:/var/log/edqs
+      - ./tb-edqs/log:/var/log/tb-edqs
     ports:
       - "8080"
     depends_on:

docker/edqs/conf/logback.xml → docker/tb-edqs/conf/logback.xml

@@ -21,10 +21,10 @@
 
     <appender name="fileLogAppender"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/var/log/edqs/${TB_SERVICE_ID}/tb-edqs.log</file>
+        <file>/var/log/tb-edqs/${TB_SERVICE_ID}/tb-edqs.log</file>
         <rollingPolicy
                 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>/var/log/edqs/tb-edqs.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>/var/log/tb-edqs/tb-edqs.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>3GB</totalSizeCap>

docker/edqs/conf/edqs.conf → docker/tb-edqs/conf/tb-edqs.conf

@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-export JAVA_OPTS="$JAVA_OPTS -Xlog:gc*,heap*,age*,safepoint=debug:file=/var/log/edqs/${TB_SERVICE_ID}-gc.log:time,uptime,level,tags:filecount=10,filesize=10M"
+export JAVA_OPTS="$JAVA_OPTS -Xlog:gc*,heap*,age*,safepoint=debug:file=/var/log/tb-edqs/${TB_SERVICE_ID}-gc.log:time,uptime,level,tags:filecount=10,filesize=10M"
 export JAVA_OPTS="$JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError"
 export JAVA_OPTS="$JAVA_OPTS -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
 export JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC -XX:MaxGCPauseMillis=500 -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:MaxTenuringThreshold=10"
 export LOG_FILENAME=tb-edqs.out
-export LOADER_PATH=/usr/share/edqs/conf
+export LOADER_PATH=/usr/share/tb-edqs/conf