From 71825b1cdec7f1b175e5e9fcc0bb10de158af5d3 Mon Sep 17 00:00:00 2001 From: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:01:48 -0700 Subject: [PATCH 1/3] 24.3 fb fix jarfile name (#75) * set bootstrap full text index path (#64) * bump openssl version (#67) * update labkeyServer.jar file name --------- Co-authored-by: github-actions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c01df59..d75e483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -199,7 +199,7 @@ RUN [ -n "${DEBUG}" ] && set -x; \ chown -Rc labkey:labkey "${LABKEY_HOME}"; -COPY "labkeyServer-${LABKEY_VERSION}.jar" \ +COPY "labkeyServer.jar" \ "app.jar" # add spring properties From 40f1a271488fdb9bbd7e38f6ca5b359d2a0b4692 Mon Sep 17 00:00:00 2001 From: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:21:04 -0700 Subject: [PATCH 2/3] 24.3 fb remove rename of labkeyServer.jar to app.jar (#77) * remove rename of jar file to app.jar * update jar file copy path --- Dockerfile | 3 +-- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d75e483..d9ce881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -199,8 +199,7 @@ RUN [ -n "${DEBUG}" ] && set -x; \ chown -Rc labkey:labkey "${LABKEY_HOME}"; -COPY "labkeyServer.jar" \ - "app.jar" +COPY "labkeyServer.jar" "${LABKEY_HOME}" # add spring properties COPY application.properties config/ diff --git a/entrypoint.sh b/entrypoint.sh index 85fcddd..5bb85ab 100755 --- 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} \ \ From a800169605dd5c12537c957113fbac3598460a6a Mon Sep 17 00:00:00 2001 From: Will Mooreston <97046018+labkey-willm@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:34:12 -0700 Subject: [PATCH 3/3] [LabKey Cloud] issue 49843: update ciphers (#73) * set bootstrap full text index path (#64) * bump openssl version (#67) * uniquify container names for latest docker-compose * issue 49843: update ciphers to latest default * Update Dockerfile with suggested ciphers Co-authored-by: Josh Eckels * Update application.properties with suggested ciphers Co-authored-by: Josh Eckels * revert accidental logging change --------- Co-authored-by: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com> Co-authored-by: github-actions Co-authored-by: Josh Eckels --- Dockerfile | 4 ++-- application.properties | 4 ++-- docker-compose.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9ce881..2e8b524 100644 --- 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= diff --git a/application.properties b/application.properties index d9551c5..833e86d 100644 --- 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 index 7a155cb..5d4d7ee 100644 --- 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: