From adcbc1de8c223a2aa19f7b8876456534d5517eb9 Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Tue, 30 Jul 2024 13:19:39 -0400 Subject: [PATCH] Update solr-ocrhighlighting and make SOLR_HOCR_PLUGIN_PATH available to php-fpm (#345) * Make SOLR_HOCR_PLUGIN_PATH available to php-fpm * solr-ocrhighlighting 0.9.0 * wrap in quotes --- nginx/Dockerfile | 3 ++- nginx/rootfs/etc/confd/templates/www.conf.tmpl | 2 ++ solr/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 2d3f2a4d..c8e3db5d 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -89,6 +89,7 @@ ENV \ PHP_POST_MAX_SIZE=128M \ PHP_PROCESS_CONTROL_TIMEOUT=60 \ PHP_REQUEST_TERMINATE_TIMEOUT=60 \ - PHP_UPLOAD_MAX_FILESIZE=128M + PHP_UPLOAD_MAX_FILESIZE=128M \ + SOLR_HOCR_PLUGIN_PATH=/opt/solr/server/solr/contrib/ocrhighlighting/lib COPY --link rootfs / diff --git a/nginx/rootfs/etc/confd/templates/www.conf.tmpl b/nginx/rootfs/etc/confd/templates/www.conf.tmpl index d0d68890..2e727677 100644 --- a/nginx/rootfs/etc/confd/templates/www.conf.tmpl +++ b/nginx/rootfs/etc/confd/templates/www.conf.tmpl @@ -436,3 +436,5 @@ clear_env = yes ;php_admin_value[error_log] = /var/log/php83/$pool.error.log ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M + +env['SOLR_HOCR_PLUGIN_PATH'] = "{{ getenv "SOLR_HOCR_PLUGIN_PATH" }}" diff --git a/solr/Dockerfile b/solr/Dockerfile index 901324a5..130dc741 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -6,10 +6,10 @@ ARG SOLR_VERSION=9.5.0 ARG SOLR_FILE=solr-${SOLR_VERSION}.tgz ARG SOLR_URL=https://archive.apache.org/dist/solr/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz ARG SOLR_FILE_SHA256=d8538502019af1945e0b124a4613b46ca43aedcf3f20e9912c482c080407ea21 -ARG OCRHIGHLIGHT_VERSION=0.8.6 +ARG OCRHIGHLIGHT_VERSION=0.9.0 ARG OCRHIGHLIGHT_FILE=solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar ARG OCRHIGHLIGHT_URL=https://github.com/dbmdz/solr-ocrhighlighting/releases/download/${OCRHIGHLIGHT_VERSION}/solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar -ARG OCRHIGHLIGHT_FILE_SHA256=3cf22d554003347de5486a1e2b6b624759495122a5b35fef9d8306eeb5e14f61 +ARG OCRHIGHLIGHT_FILE_SHA256=79eb7374989359c74903daefbe61f7feb9aeb7367ee6f7e1361fe8b911d2fa82 ARG OCRHIGHLIGHT_DEST=/opt/solr/server/solr/contrib/ocrhighlighting/lib EXPOSE 8983