This is an automated email from the ASF dual-hosted git repository.
tloubrieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new 92e734f change solr helm chart dependency to stable (#145)
92e734f is described below
commit 92e734f913b62d61086a3c6da515157ef361281c
Author: thomas loubrieu <[email protected]>
AuthorDate: Mon Dec 6 10:40:22 2021 -0500
change solr helm chart dependency to stable (#145)
* change solr helm chart dependency to stable
* disable solr authentication by default
* update specific sdap solr docker image for JTS support
Co-authored-by: Thomas Loubrieu <[email protected]>
---
docker/solr/Dockerfile | 11 ++++-------
docker/solr/Readme.rst | 2 +-
helm/requirements.yaml | 4 ++--
helm/templates/_helpers.tpl | 2 +-
helm/values.yaml | 4 +++-
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
index edcaa7b..a08579a 100644
--- a/docker/solr/Dockerfile
+++ b/docker/solr/Dockerfile
@@ -12,11 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM solr:8.4.0
-
+FROM bitnami/solr:8.11.0-debian-10-r0
+ADD
https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/1.15.0/jts-core-1.15.0.jar
/opt/bitnami/solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core-1.15.0.jar
USER root
-
-RUN wget
https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/1.17.1/jts-core-1.17.1.jar
&& \
- cp jts-core-1.17.1.jar
/opt/solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core-1.17.1.jar
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["solr-foreground"]
\ No newline at end of file
+RUN chmod a+r
/opt/bitnami/solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core-1.15.0.jar
+USER 1001
diff --git a/docker/solr/Readme.rst b/docker/solr/Readme.rst
index 6ecbe5b..7e31d97 100644
--- a/docker/solr/Readme.rst
+++ b/docker/solr/Readme.rst
@@ -34,7 +34,7 @@ This image can be built by:
.. code-block:: bash
- docker build -t sdap/solr:${BUILD_VERSION} .
+ docker build -t nexusjpl/solr:${BUILD_VERSION} .
How to Run
^^^^^^^^^^
diff --git a/helm/requirements.yaml b/helm/requirements.yaml
index b2f68d4..360ecdf 100644
--- a/helm/requirements.yaml
+++ b/helm/requirements.yaml
@@ -8,8 +8,8 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
condition: rabbitmq.enabled
- name: solr
- version: 1.5.2
- repository: https://charts.helm.sh/incubator
+ version: 2.1.3
+ repository: https://charts.bitnami.com/bitnami
condition: solr.enabled
- name: cassandra
version: 5.5.3
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
index 6578166..46dafe2 100644
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -48,7 +48,7 @@ The data volume mount which is used in both the Collection
Manager and the Granu
{{- end -}}
{{- define "nexus.urls.solr" -}}
-{{ .Values.external.solrHostAndPort | default (print "http://"; .Release.Name
"-solr-svc:8983") }}
+{{ .Values.external.solrHostAndPort | default (print "http://"; .Release.Name
"-solr:8983") }}
{{- end -}}
{{- define "nexus.urls.zookeeper" -}}
diff --git a/helm/values.yaml b/helm/values.yaml
index 70c8bba..0a97682 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -120,8 +120,10 @@ solr:
initPodEnabled: true
image:
repository: nexusjpl/solr
- tag: 8.4.0
+ tag: 8.11.0
replicaCount: 3
+ authentication:
+ enabled: false
volumeClaimTemplates:
storageClassName: hostpath
storageSize: 10Gi
