Dockerfile +pkg patch curl bash jq

fix curl auth

Dockerfile

@@ -6,6 +6,7 @@ RUN mkdir /opt/toolbox
 COPY toolbox/ /opt/toolbox/
 
 # unzip toolbox
+RUN apk add patch curl bash jq
 RUN cd /opt/toolbox && unzip -o cdh-toolbox-${VERSION}.zip && patch -p0 < solr-config.patch
 
 CMD /opt/toolbox/init.sh

init-solr.yaml

@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - image: gitlab-registry.cesnet.cz/702/provoz/gss/init-solr:1.4.3-cesnet0
+      - image: gitlab-registry.cesnet.cz/702/provoz/gss/init-solr:1.4.3-cesnet1
         name: init-solr
         envFrom:
         - secretRef:

toolbox/init.sh

@@ -8,7 +8,8 @@ export SOLR_PASSWORD="${SOLR_PASSWORD}"
 # Create solr collection
 cd /opt/toolbox/solr
 echo "Creating Solr collection..."
-curl "http://$SOLR_HOST:8983/solr/admin/collections?action=CREATE&name=${SOLR_CORE}&numShards=1&replicationFactor=3&collection.configName=_default"
+[ -n "$SOLR_USER" -a -n "$SOLR_PASSWORD" ] && CURL_OPTS="-u $SOLR_USER:$SOLR_PASSWORD"
+curl $CURL_OPTS "$SOLR_URL/admin/collections?action=CREATE&name=${SOLR_CORE}&numShards=1&replicationFactor=3&collection.configName=_default"
 echo "Solr collection ${SOLR_CORE} created."
 
 # Update solr schema