Update dockerfile

8.11/Dockerfile

@@ -112,15 +112,19 @@ RUN set -ex; \
   sed -i -e 's/lsof -PniTCP:/lsof -t -PniTCP:/' /opt/solr/bin/solr; \
   chown -R "0:0" /opt/solr-$SOLR_VERSION /docker-entrypoint-initdb.d /opt/docker-solr; \
   chown -R "$SOLR_USER:0" /var/solr; \
+  chown -R "$SOLR_USER:$SOLR_USER" /opt/solr; \
   { command -v gpgconf; gpgconf --kill all || :; }; \
   rm -r "$GNUPGHOME"
 
 COPY --chown=0:0 scripts /opt/docker-solr/scripts
 
+COPY ./script.sh /opt/solr
+COPY ./basicauth.properties /opt/solr
+RUN chmod +x /opt/solr/script.sh
+
 VOLUME /var/solr
 EXPOSE 8983
 WORKDIR /opt/solr
 USER $SOLR_UID
 
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["solr-foreground"]
+ENTRYPOINT ["/opt/solr/script.sh"]

8.11/basicauth.properties

@@ -0,0 +1,2 @@
+httpBasicAuthUser=$SOLR_USER
+httpBasicAuthPassword=$SOLR_PASSWORD

8.11/script.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+docker-entrypoint.sh solr-foreground &
+
+# export JAVA_OPTS="-Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=truststorePassword -Dsolr.httpclient.builder.factory=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory -Dsolr.httpclient.config=/opt/solr/basicauth.properties -DzkCredentialsProvider=org.apache.solr.common.cloud.VMParamsSingleSetCredentialsDigestZkCredentialsProvider"
+# export CLASSPATH_PREFIX="/opt/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.11.jar"
+
+export JAVA_OPTS="-Dsolr.httpclient.builder.factory=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory -Dsolr.httpclient.config=/opt/solr/basicauth.properties -DzkCredentialsProvider=org.apache.solr.common.cloud.VMParamsSingleSetCredentialsDigestZkCredentialsProvider"
+# export CLASSPATH_PREFIX="/opt/solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.11.jar"
+
+while true; do
+    RESULT=$(curl -s -o /dev/null -I -w '%{http_code}' -u "${SOLR_USER}:${SOLR_PASSWORD}" http://${CLUSTER_NAME}.${POD_NAMESPACE}.svc.cluster.local:8983/solr/admin/cores?action=STATUS)
+    if [ "$RESULT" -eq '200' ]; then
+        break
+    fi
+done
+
+/opt/solr/contrib/prometheus-exporter/bin/solr-exporter -p 9854 -z ${ZK_HOST} -f /opt/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml -n 16
+

9.4/Dockerfile

@@ -117,9 +117,13 @@ RUN set -ex; \
   chmod 0664 /etc/default/solr.in.sh; \
   mkdir -p -m0770 /var/solr; \
   chown -R "$SOLR_USER:0" /var/solr; \
+  chown -R "$SOLR_USER:$SOLR_USER" /opt/solr; \
   test ! -e /opt/solr/modules || ln -s /opt/solr/modules /opt/solr/contrib; \
   test ! -e /opt/solr/prometheus-exporter || ln -s /opt/solr/prometheus-exporter /opt/solr/modules/prometheus-exporter;
 
+COPY ./script.sh /opt/solr
+RUN chmod +x /opt/solr/script.sh
+
 RUN set -ex; \
     apt-get update; \
     apt-get -y --no-install-recommends install acl lsof procps wget netcat gosu tini jattach; \
@@ -128,7 +132,8 @@ RUN set -ex; \
 VOLUME /var/solr
 EXPOSE 8983
 WORKDIR /opt/solr
+
+
 USER $SOLR_UID
 
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["solr-foreground"]
+ENTRYPOINT ["/opt/solr/script.sh"]

9.4/script.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+docker-entrypoint.sh solr-foreground &
+
+while true; do
+    RESULT=$(curl -s -o /dev/null -I -w '%{http_code}' -u "${SOLR_USER}:${SOLR_PASSWORD}" http://${CLUSTER_NAME}.${POD_NAMESPACE}.svc.cluster.local:8983/solr/admin/cores?action=STATUS)
+    if [ "$RESULT" -eq '200' ]; then
+        break
+    fi
+done
+
+if [[ "${SECURITY_ENABLED}" == "true" ]]; then
+    /opt/solr/contrib/prometheus-exporter/bin/solr-exporter -p 9854 -z ${ZK_HOST} -f /opt/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml -n 16 -u "${SOLR_USER}:${SOLR_PASSWORD}"
+else
+    /opt/solr/contrib/prometheus-exporter/bin/solr-exporter -p 9854 -z ${ZK_HOST} -f /opt/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml -n 16
+fi