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/2] 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 a80797c08e251ee4e0b8ec475a3e4757b353dbb7 Mon Sep 17 00:00:00 2001 From: labkey-willm Date: Fri, 1 Mar 2024 10:54:56 -0800 Subject: [PATCH 2/2] stop installing tomcat native library --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3aaecd6..3acd04f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,7 +125,6 @@ RUN [ -n "${DEBUG}" ] && set -x; \ if echo "${FROM_TAG}" | grep -i 'alpine'; then \ apk update \ && apk add --no-cache \ - tomcat-native=2.0.3-r0 \ openssl=3.1.1-r1 \ gettext=0.21.1-r7 \ unzip=6.0-r14 \ @@ -148,7 +147,6 @@ RUN [ -n "${DEBUG}" ] && set -x; \ export DEBIAN_FRONTEND=noninteractive; \ apt-get update; \ apt-get -yq --no-install-recommends install \ - libtcnative-1=1.2.31-1build1 \ openssl=3.0.2-0ubuntu1.14 \ gettext-base=0.21-4ubuntu4 \ unzip=6.0-26ubuntu3.1 \