Use wait-for-solr, install curl

wodby · Feb 19, 2025 · 10557d6 · 10557d6
1 parent 8aea9bd
commit 10557d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -90,6 +90,7 @@ RUN set -ex; \
     \
     apk add --no-cache \
         bash \
+        curl \
         make \
         procps-ng \
         sudo; \
@@ -105,4 +106,4 @@ COPY security.json /
 USER solr
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["solr-foreground"]
+CMD ["solr-foreground", "-c"]
diff --git a/bin/actions.mk b/bin/actions.mk
@@ -76,7 +76,7 @@ add-admin-user:
 		-H 'Content-type:application/json' -d '{"set-user-role":{"$(user)": ["admin"]}}' | grep -vq 'errorMessages'
 
 check-ready:
-	wait_solr $(host) $(max_try) $(wait_seconds) $(delay_seconds)
+	wait-for-solr.sh --solr-url http://$(host):8983 --max-attempts $(max_try) --wait-seconds $(wait_seconds)
 
 check-live:
 	@echo "OK"
diff --git a/bin/wait_solr b/bin/wait_solr