default solr vocab to disabled.

Added curl webapi test back.

.env

@@ -213,8 +213,10 @@ WEBAPI_GITHUB_URL="https://github.com/OHDSI/WebAPI.git#rc-2.13.0"
 # SOLR Vocab (optional)
 ############################################################################################################################################################
 
-# keep as-is if using Broadsea to launch SOLR OMOP Vocabulary, otherwise replace with external SOLR OMOP Vocabulary endpoint
-SOLR_VOCAB_ENDPOINT="http://broadsea-solr-vocab:8983/solr"
+# keep blank if not using Solr Vocab
+# if using Broadsea to launch SOLR OMOP Vocabulary, use http://broadsea-solr-vocab:8983/solr"
+# otherwise replace with external SOLR OMOP Vocabulary endpoint
+SOLR_VOCAB_ENDPOINT=""
 
 # if using Broadsea to launch SOLR, fill these out to build the vocab core
 SOLR_VOCAB_VERSION="v5.0_23-JAN-23" # replace spaces with underscores

.github/workflows/default.yml

@@ -32,4 +32,6 @@ jobs:
         run: |
           docker-compose --env-file .env --profile webapi-from-image up -d
           sleep 180
-          docker logs ohdsi-webapi
+          docker logs ohdsi-webapi
+      - name: Test WebAPI info endpoint
+        run: curl -s --retry 10 --retry-connrefused http://127.0.0.1/WebAPI/info

docker-compose.yml

@@ -149,10 +149,10 @@ services:
     entrypoint: ["/bin/sh", "/entrypoint.sh"]
     labels:
       - "traefik.enable=true"
-    command:
-      - solr-precreate
-      - ${SOLR_VOCAB_VERSION}
-      - /tmp/solr_config
+    # command:
+    #   - solr-precreate
+    #   - ${SOLR_VOCAB_VERSION}
+    #   - /tmp/solr_config
     healthcheck:
       test: curl --fail ${SOLR_VOCAB_ENDPOINT} || exit 1
       interval: 10s