From 96db64f0881c321b8976eb841a0758de9989292e Mon Sep 17 00:00:00 2001
From: "honza801@ADMIN.META" <krcmar@cesnet.cz>
Date: Thu, 3 Oct 2024 14:11:45 +0200
Subject: [PATCH] Dockerfile +pkg patch curl bash jq
fix curl auth
---
Dockerfile | 1 +
init-solr.yaml | 2 +-
toolbox/init.sh | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 18d3b6f..68e2bce 100644
--- a/Dockerfile
+++ b/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
diff --git a/init-solr.yaml b/init-solr.yaml
index 44e9a57..be03e8a 100644
--- a/init-solr.yaml
+++ b/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:
diff --git a/toolbox/init.sh b/toolbox/init.sh
index 4cb4b6c..12ce305 100755
--- a/toolbox/init.sh
+++ b/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
--
GitLab