From 84530b38c6801bd24869015b731442926485d6d6 Mon Sep 17 00:00:00 2001
From: openeuler_bot <zhaiwenjie1@huawei.com>
Date: Fri, 7 Nov 2025 00:13:27 +0000
Subject: [PATCH] 24.03-lts-sp2 update solr to 9.10.0

---
 Others/solr/9.10.0/24.03-lts-sp2/Dockerfile   | 27 +++++++++++++++++++
 .../solr/9.10.0/24.03-lts-sp2/entrypoint.sh   | 12 +++++++++
 .../solr/9.10.0/24.03-lts-sp2/solr-start.sh   | 20 ++++++++++++++
 Others/solr/README.md                         |  1 +
 Others/solr/doc/image-info.yml                |  3 ++-
 Others/solr/meta.yml                          |  4 ++-
 6 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 Others/solr/9.10.0/24.03-lts-sp2/Dockerfile
 create mode 100644 Others/solr/9.10.0/24.03-lts-sp2/entrypoint.sh
 create mode 100644 Others/solr/9.10.0/24.03-lts-sp2/solr-start.sh

diff --git a/Others/solr/9.10.0/24.03-lts-sp2/Dockerfile b/Others/solr/9.10.0/24.03-lts-sp2/Dockerfile
new file mode 100644
index 00000000..ee9fe3df
--- /dev/null
+++ b/Others/solr/9.10.0/24.03-lts-sp2/Dockerfile
@@ -0,0 +1,27 @@
+ARG BASE=openeuler/openeuler:24.03-lts-sp2
+FROM ${BASE}
+
+ARG VERSION=9.10.0
+WORKDIR /
+
+RUN yum install -y java-11-openjdk-devel shadow sudo lsof
+RUN url="https://www.apache.org/dyn/closer.lua/solr/solr/${VERSION}/solr-${VERSION}.tgz?action=download"; \
+    curl --retry 10 -S -L -o solr.tgz "$url"
+
+RUN tar -zxf solr.tgz && \
+    if [ -d apache-solr-$VERSION ]; then \
+        mv -iv apache-solr-${VERSION} solr-${VERSION}; \
+    fi && \
+    test -d "solr-$VERSION" && \
+    ln -sv "solr-$VERSION" solr && \
+    rm -fv solr.tgz && \
+    rm -rf solr/doc
+
+ENV PATH=$PATH:/solr/bin
+
+RUN useradd -r -s /bin/bash solr && \
+    chown -R solr /solr* && \
+    yum remove -y shadow && \
+    yum clean all
+
+EXPOSE 8983 8984 9983
\ No newline at end of file
diff --git a/Others/solr/9.10.0/24.03-lts-sp2/entrypoint.sh b/Others/solr/9.10.0/24.03-lts-sp2/entrypoint.sh
new file mode 100644
index 00000000..356896be
--- /dev/null
+++ b/Others/solr/9.10.0/24.03-lts-sp2/entrypoint.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+[ -n "${DEBUG:-}" ] && set -x
+
+export SOLR_USER="solr"
+
+if [ $# -gt 0 ]; then
+    exec "$@"
+else
+    /solr-start.sh
+fi
\ No newline at end of file
diff --git a/Others/solr/9.10.0/24.03-lts-sp2/solr-start.sh b/Others/solr/9.10.0/24.03-lts-sp2/solr-start.sh
new file mode 100644
index 00000000..9c2f3adf
--- /dev/null
+++ b/Others/solr/9.10.0/24.03-lts-sp2/solr-start.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+[ -n "${DEBUG:-}" ] && set -x
+
+export JAVA_HOME="${JAVA_HOME:-/usr}"
+
+export SOLR_HOME="/solr"
+
+cd "$SOLR_HOME"
+
+# Solr 5+ insists on SOLR_HOME being set to /solr/server/solr dir containing solr.xml
+set +o pipefail # in case solr version doesn't exist in older versions
+if [ "$(solr version|cut -c 1)" -ge 5 ]; then
+    export SOLR_HOME="$SOLR_HOME/server/solr"
+    solr start -f
+else
+    cd "$SOLR_HOME/example"
+    java -jar start.jar
+fi
\ No newline at end of file
diff --git a/Others/solr/README.md b/Others/solr/README.md
index 8cab4031..8af3ca7b 100644
--- a/Others/solr/README.md
+++ b/Others/solr/README.md
@@ -16,6 +16,7 @@ The tag of each `solr` docker image is consist of the version of `solr` and the
 
 | Tag                                                                                                                             | Currently                              | Architectures |
 |---------------------------------------------------------------------------------------------------------------------------------|----------------------------------------|---------------|
+|[9.10.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/solr/9.10.0/24.03-lts-sp2/Dockerfile) | solr 9.10.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 |
 | [9.8.1-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/solr/9.8.1/24.03-lts-sp1/Dockerfile) | Apache Solr 9.8.1 on openEuler 24.03-LTS-SP1 | amd64, arm64  |
 
 # Usage
diff --git a/Others/solr/doc/image-info.yml b/Others/solr/doc/image-info.yml
index da69cf68..bb146fc2 100644
--- a/Others/solr/doc/image-info.yml
+++ b/Others/solr/doc/image-info.yml
@@ -11,6 +11,7 @@ tags: |
 
   |    Tag   |  Currently  |   Architectures  |
   |----------|-------------|------------------|
+  |[9.10.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/solr/9.10.0/24.03-lts-sp2/Dockerfile) | solr 9.10.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 |
   | [3.7.2.0-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/solr/3.7.2.0/24.03-lts-sp1/Dockerfile) | solr 3.7.2.0 on openEuler 24.03-LTS-SP1 | amd64, arm64  |
 
 download: |
@@ -32,4 +33,4 @@ license: GPL-2.0 license
 similar_packages:
   - N/A
 dependency:
-  - N/A
+  - N/A
\ No newline at end of file
diff --git a/Others/solr/meta.yml b/Others/solr/meta.yml
index 88cb8515..1147916a 100644
--- a/Others/solr/meta.yml
+++ b/Others/solr/meta.yml
@@ -2,4 +2,6 @@
   path: 9.8.1/24.03-lts-sp1/Dockerfile
 
 9.9.0-oe2403sp1:
-  path: 9.9.0/24.03-lts-sp1/Dockerfile
\ No newline at end of file
+  path: 9.9.0/24.03-lts-sp1/Dockerfile
+9.10.0-oe2403sp2:
+  path: 9.10.0/24.03-lts-sp2/Dockerfile
\ No newline at end of file
-- 
Gitee