Skip to content

Commit

Permalink
PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
artntek committed Nov 2, 2023
1 parent f27a98a commit 4b9659c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Note: the prior alpine-based openjdk image had network DNS issues, so replacing with Eclipse Temurin
FROM eclipse-temurin:17.0.8.1_1-jre-jammy

ARG TAG=2.0.0
ARG TAG=3.0.0-SNAPSHOT
ENV TAG=${TAG}
ENV DATAONE_INDEXER_CONFIG=/etc/dataone/dataone-indexer.properties

Expand Down
2 changes: 1 addition & 1 deletion helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
{{- .Values.solr.customCollection -}}
/admin/file?file=schema.xml&contentType=text/xml"{{- printf " " -}}
| grep -c "<schema name=\"dataone\"") == 1 ]]; do
echo waiting for Solr Schema to be accessible at ; sleep 1; done
echo waiting for Solr Schema to be accessible; sleep 1; done
- name: init-rabbitmq
image: busybox:latest
command: ['sh', '-c', "until nc -z {{ .Values.rabbitmq.hostname }} {{ .Values.rabbitmq.hostport}} > /dev/null; do echo waiting for RabbitMQ; sleep 2; done"]
Expand Down
4 changes: 2 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ rabbitmq:
persistence:
size: 10Gi
#replicaCount: 3
#If you change the number of the max priority, the existing queue must be deleted. And consumers must use the same number.
#If you change the number of the max priority, the existing queue must be deleted, and consumers
# must use the same number.
#max.priority: 10

solr:
Expand Down Expand Up @@ -133,7 +134,6 @@ solr:
lifecycleHooks:
postStart:
exec:
#command: ["/bin/bash", "-c", "env > /tmp/lifecycle-env"]
command: ["/bin/bash", "-c", "/solrconfig/config-solr.sh"]
containerSecurityContext:
runAsUser: 1000
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.dataone</groupId>
<artifactId>dataone-index-worker</artifactId>
<version>DEVELOP</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dataone-index-worker</name>
<url>http://maven.apache.org</url>
Expand Down

0 comments on commit 4b9659c

Please sign in to comment.