Merge 24.3 to develop

LabKey · Mar 20, 2024 · 0ab6ea7 · 0ab6ea7
2 parents 9a71664 + a800169
commit 0ab6ea7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -73,9 +73,9 @@ ENV DEBUG="${DEBUG}" \
     TOMCAT_KEYSTORE_FORMAT="PKCS12" \
     TOMCAT_KEYSTORE_ALIAS="tomcat" \
     \
-    TOMCAT_SSL_CIPHERS="HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL" \
+    TOMCAT_SSL_CIPHERS="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH" \
     TOMCAT_SSL_PROTOCOL="TLS" \
-    TOMCAT_SSL_ENABLED_PROTOCOLS="-TLSv1.3,+TLSv1.2" \
+    TOMCAT_SSL_ENABLED_PROTOCOLS="TLSv1.3,TLSv1.2" \
     \
     TOMCAT_ENABLE_ACCESS_LOG= 
 
@@ -199,8 +199,7 @@ RUN [ -n "${DEBUG}" ] && set -x; \
     chown -Rc labkey:labkey "${LABKEY_HOME}";
 
 
-COPY "labkeyServer-${LABKEY_VERSION}.jar" \
-    "app.jar"
+COPY "labkeyServer.jar" "${LABKEY_HOME}"
 
 # add spring properties
 COPY application.properties config/

diff --git a/application.properties b/application.properties
@@ -121,8 +121,8 @@ server.http2.enabled=true
 
 server.ssl.enabled=true
 
-server.ssl.ciphers=${TOMCAT_SSL_CIPHERS:-HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL}
-server.ssl.enabled-protocols=${TOMCAT_SSL_ENABLED_PROTOCOLS:-TLSv1.3,+TLSv1.2}
+server.ssl.ciphers=${TOMCAT_SSL_CIPHERS:-HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH}
+server.ssl.enabled-protocols=${TOMCAT_SSL_ENABLED_PROTOCOLS:-TLSv1.3,TLSv1.2}
 server.ssl.protocol=${TOMCAT_SSL_PROTOCOL:-TLS}
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ version: "3"
 services:
   community:
     image: labkey/community
-    container_name: ${IDENT:-labkey}
+    container_name: labkey
     # build: {"context": ".", "args": ["LABKEY_VERSION=21.3-SNAPSHOT"]}
     # deploy:
     #   resources:
@@ -115,7 +115,7 @@ services:
 # below are for internal LabKey testing
   allpg:
     image: ${COMPOSE_IMAGE:-labkey/community}
-    container_name: ${IDENT:-allpg}
+    container_name: allpg
     # build: {"context": ".", "args": ["LABKEY_VERSION=21.3-SNAPSHOT"]}
     # deploy:
     #   resources:
@@ -224,7 +224,7 @@ services:
 
   enterprise:
     image: ${COMPOSE_IMAGE:-labkey/community}
-    container_name: ${IDENT:-enterprise}
+    container_name: enterprise
     # build: {"context": ".", "args": ["LABKEY_VERSION=21.3-SNAPSHOT"]}
     # deploy:
     #   resources:
@@ -333,7 +333,7 @@ services:
 
   lims_starter:
     image: ${COMPOSE_IMAGE:-labkey/community}
-    container_name: ${IDENT:-lims_starter}
+    container_name: lims_starter
     # build: {"context": ".", "args": ["LABKEY_VERSION=21.3-SNAPSHOT"]}
     # deploy:
     #   resources:

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -297,7 +297,7 @@ main() {
     \
     ${JAVA_PRE_JAR_EXTRA} \
     \
-    -jar app.jar \
+    -jar labkeyServer.jar \
     \
     ${JAVA_POST_JAR_EXTRA} \
     \