From 69156b55af4e129520ccfd6f88944f439fcd2745 Mon Sep 17 00:00:00 2001
From: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com>
Date: Fri, 1 Mar 2024 08:53:19 -0800
Subject: [PATCH 1/5] set bootstrap full text index path (#64)

---
 startup/basic.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/startup/basic.properties b/startup/basic.properties
index d5c887e..def42ee 100644
--- a/startup/basic.properties
+++ b/startup/basic.properties
@@ -15,4 +15,6 @@ SiteSettings.pipelineToolsDirectory;bootstrap=${LABKEY_HOME}
 SiteSettings.sslPort;startup=${LABKEY_PORT}
 SiteSettings.sslRequired;startup=true
 
+SearchSettings.indexFilePath;bootstrap=${LABKEY_FILES_ROOT}/labkey_full_text_index
+
 ${LABKEY_STARTUP_BASIC_EXTRA}

From 5edebb956ea8df1fcd2651dbaad9e6a25f2d1e3e Mon Sep 17 00:00:00 2001
From: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:54:28 -0700
Subject: [PATCH 2/5] bump openssl version (#67)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 999a856..c01df59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -147,7 +147,7 @@ RUN [ -n "${DEBUG}" ] && set -x; \
         export DEBIAN_FRONTEND=noninteractive; \
         apt-get update; \
         apt-get -yq --no-install-recommends install \
-            openssl=3.0.2-0ubuntu1.14 \
+            openssl=3.0.2-0ubuntu1.15 \
             gettext-base=0.21-4ubuntu4 \
             unzip=6.0-26ubuntu3.1 \
             ; \

From 9a716646969e493b8e09889dd8066bb77f0f252b Mon Sep 17 00:00:00 2001
From: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:24:46 -0700
Subject: [PATCH 3/5] update GH actions to run on release branches and release
 targeted FBs (#78)

---
 .github/workflows/dockle_xeol.yml | 2 ++
 .github/workflows/hadolint.yml    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/dockle_xeol.yml b/.github/workflows/dockle_xeol.yml
index 2a8566b..8ca0333 100644
--- a/.github/workflows/dockle_xeol.yml
+++ b/.github/workflows/dockle_xeol.yml
@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - fb_*
+      - '*_fb_*'
 
   pull_request:
     branches:
       - develop
+      - 'release*'
 
 jobs:
   dockle:
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
index bf723ec..f676640 100644
--- a/.github/workflows/hadolint.yml
+++ b/.github/workflows/hadolint.yml
@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - fb_*
+      - '*_fb_*'
 
   pull_request:
     branches:
       - develop
+      - 'release*'
 
 jobs:
   hadolint:

From 3690df8ed711eba280cfd850bd69589bbe541ce0 Mon Sep 17 00:00:00 2001
From: labkey-willm <willm@labkey.com>
Date: Fri, 22 Mar 2024 13:17:10 -0700
Subject: [PATCH 4/5] revert previous cipher update

---
 Dockerfile             | 2 +-
 application.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2e8b524..ea7a7bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,7 +73,7 @@ ENV DEBUG="${DEBUG}" \
     TOMCAT_KEYSTORE_FORMAT="PKCS12" \
     TOMCAT_KEYSTORE_ALIAS="tomcat" \
     \
-    TOMCAT_SSL_CIPHERS="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH" \
+    TOMCAT_SSL_CIPHERS="HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL" \
     TOMCAT_SSL_PROTOCOL="TLS" \
     TOMCAT_SSL_ENABLED_PROTOCOLS="TLSv1.3,TLSv1.2" \
     \
diff --git a/application.properties b/application.properties
index 833e86d..71f7078 100644
--- a/application.properties
+++ b/application.properties
@@ -121,7 +121,7 @@ server.http2.enabled=true
 
 server.ssl.enabled=true
 
-server.ssl.ciphers=${TOMCAT_SSL_CIPHERS:-HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH}
+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.protocol=${TOMCAT_SSL_PROTOCOL:-TLS}
 

From 566a78251cd79fecbfafda55eb8f76118f304c55 Mon Sep 17 00:00:00 2001
From: labkey-willm <willm@labkey.com>
Date: Fri, 22 Mar 2024 13:25:48 -0700
Subject: [PATCH 5/5] fix dockle to work w/ labkeyServer.jar name

---
 .github/workflows/dockle_xeol.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dockle_xeol.yml b/.github/workflows/dockle_xeol.yml
index 8ca0333..c015529 100644
--- a/.github/workflows/dockle_xeol.yml
+++ b/.github/workflows/dockle_xeol.yml
@@ -20,6 +20,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Build an image from Dockerfile
         run: |
+          cp labkeyServer-HelloWorld.jar labkeyServer.jar
           LABKEY_VERSION=HelloWorld make build
       - name: Run dockle on helloworld image
         uses: goodwithtech/dockle-action@0.1.0