fix default logging parameter locations and update lib

Dockerfile

@@ -39,24 +39,24 @@ RUN  apk update \
   && apk upgrade \
   && apk add --update openjdk11 curl bash \
   && rm -rf /var/cache/apk/*
-  
+
 RUN addgroup -S astm --gid 9257 && adduser -S astm -s /bin/bash -u 9257 -G astm
 RUN mkdir /app
 RUN chown astm:astm /app 
 
 
 #Deploy the war into tomcat image and point root to it
 COPY --from=build /build/target/*.jar /app/astm-http-bridge.jar
-    
+
 ADD healthcheck.sh /app/healthcheck.sh
 ADD docker-entrypoint.sh /app/docker-entrypoint.sh
 RUN chown astm:astm /app/docker-entrypoint.sh; \
-    chmod 770 /app/docker-entrypoint.sh;  \
-    chown astm:astm /app/ASTM.jar; \
-    chmod 770 /app/ASTM.jar; \
-    chown astm:astm /app/healthcheck.sh; \
-    chmod 770 /app/healthcheck.sh; 
-    
+  chmod 770 /app/docker-entrypoint.sh;  \
+  chown astm:astm /app/astm-http-bridge.jar; \
+  chmod 770 /app/astm-http-bridge.jar; \
+  chown astm:astm /app/healthcheck.sh; \
+  chmod 770 /app/healthcheck.sh; 
+
 USER astm:astm
 
 ENTRYPOINT [ "/app/docker-entrypoint.sh" ]

docker-compose-dev.yml

@@ -12,9 +12,16 @@ services:
             - "8000:8000"
         volumes:
             - ./configuration.yml:/app/configuration.yml
+            - /home/caleb/projects/UW-Projects/OpenELIS-Global-2/dev/https/int.caleb.dev.openelisci.org.truststore.p12:/etc/truststore 
+        extra_hosts:
+            - "host.openelis.org:10.0.0.101"
         environment:
             SPRING_PROFILE: dev
-            JAVA_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:8000
+            LOGGING_LEVEL_ORG_ITECH: DEBUG 
+            JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:8000 
+              -Djavax.net.ssl.trustStore=/etc/truststore
+              -Djavax.net.ssl.trustStorePassword=testtest
+              -Djavax.net.ssl.trustStoreType=PKCS12"
         logging:
             driver: "local"
             options:
@@ -26,4 +33,6 @@ services:
             interval: 30s
             retries: 3
             start_period: 2m
+
+
 

docker-compose-devhub.yml

@@ -0,0 +1,25 @@
+version: '3.8'
+services:
+    astm-http-bridge:
+        container_name: astm-http-bridge 
+        image: ctsteele/astm-http-bridge:develop
+        ports:
+            - "8442:8443"
+            - "12000:12001"
+        volumes:
+            - ./configuration.yml:/app/configuration.yml
+        logging:
+            driver: "local"
+            options:
+              max-size: "20m"
+              max-file: "50"
+        environment:
+            SPRING_PROFILE: dev
+            LOGGING_LEVEL_ORG_ITECH: DEBUG 
+        healthcheck:
+            test: ["CMD", "/app/healthcheck.sh"]
+            timeout: 10s
+            interval: 30s
+            retries: 3
+            start_period: 2m
+

docker-compose.yml

@@ -9,6 +9,8 @@ services:
             - "12000:12001"
         volumes:
             - ./configuration.yml:/app/configuration.yml
+        environment:
+            LOGGING_LEVEL_ORG_ITECH: INFO 
         logging:
             driver: "local"
             options:

src/main/resources/application-dev.yml

@@ -5,4 +5,4 @@ server:
 #    keyStoreType: ${server.ssl.keyStoreType}
 #    key-store: ${server.ssl.keyStorePath}
 #    key-store-password: ${server.ssl.keyStorePassword}
-    
+

src/main/resources/application-prod.yml

@@ -5,3 +5,6 @@ server:
     keyStoreType: ${server.ssl.keyStoreType}
     key-store: ${server.ssl.keyStorePath}
     key-store-password: ${server.ssl.keyStorePassword}
+logging:
+  level:
+    root: INFO