From c8d731a635ee50827ea9e25e3bf8fcc297da14e2 Mon Sep 17 00:00:00 2001 From: David Ball Date: Sun, 26 May 2024 06:11:59 -0400 Subject: [PATCH] Added string interpolation to solr configuration. --- fullstack/docker-compose.yml | 16 ++++++++++++---- solr-tika/README.md | 19 +++++++++++++++++++ solr-tika/docker-compose.yml | 16 ++++++++++++---- solr/README.md | 19 +++++++++++++++++++ solr/docker-compose.yml | 16 ++++++++++++---- tika/README.md | 15 +++++++++++++++ 6 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 solr-tika/README.md create mode 100644 solr/README.md create mode 100644 tika/README.md diff --git a/fullstack/docker-compose.yml b/fullstack/docker-compose.yml index aaeafd6..cc24048 100644 --- a/fullstack/docker-compose.yml +++ b/fullstack/docker-compose.yml @@ -13,13 +13,21 @@ services: - solr-init image: solr:latest container_name: solr + env_file: + - path: ../.env.example + required: false + - path: ../.env + required: false + environment: + - SOLR_DOCS_PORT=${SOLR_DOCS_PORT-8983} + - SOLR_DOCS_CORE_NAME=${SOLR_DOCS_CORE_NAME-nm3clol_core} + - SOLR_LAW_CORE_NAME=${SOLR_LAW_CORE_NAME-vacode_core} + # - SOLR_CORE=my_core restart: unless-stopped ports: - "${SOLR_DOCS_PORT-8983}:8983" volumes: - solr-data:/var/solr -# environment: -# - SOLR_CORE=my_core command: # - /bin/sh -c "chown -R 8983:8983 /var/solr" - solr-precreate @@ -254,7 +262,7 @@ configs: file: ../solr-log4j2.xml solr_nm3clol_core_properties: content: | - name=nm3clol_core + name=${SOLR_DOCS_CORE_NAME-nm3clol_core} solr_nm3clol_core_solrconfig: file: ../solr-data/nm3clol_core/conf/solrconfig.xml solr_nm3clol_core_managed_schema: @@ -345,7 +353,7 @@ configs: file: ../solr-data/nm3clol_core/conf/synonyms.txt solr_vacode_core_properties: content: | - name=vacode_core + name=${SOLR_LAW_CORE_NAME-vacode_core} solr_vacode_core_solrconfig: file: ../solr-data/vacode_core/conf/solrconfig.xml solr_vacode_core_managed_schema: diff --git a/solr-tika/README.md b/solr-tika/README.md new file mode 100644 index 0000000..711e7d9 --- /dev/null +++ b/solr-tika/README.md @@ -0,0 +1,19 @@ +# Solr and Tika + +This Docker Compose configuration contains the minimum requirements for running Solr and Tika together. + +## Starting Up + +To run it using you own configuration: + + docker compose --env-file ../.env up -d + +Or to run it using the default development configuration: + + docker compose --env-file ../.env.example up -d + +## Shutting Down + +To stop it use: + + docker compose down diff --git a/solr-tika/docker-compose.yml b/solr-tika/docker-compose.yml index ecc6c5f..122f64c 100644 --- a/solr-tika/docker-compose.yml +++ b/solr-tika/docker-compose.yml @@ -13,13 +13,21 @@ services: - solr-init image: solr:latest container_name: solr + env_file: + - path: ../.env.example + required: false + - path: ../.env + required: false + environment: + - SOLR_DOCS_PORT=${SOLR_DOCS_PORT-8983} + - SOLR_DOCS_CORE_NAME=${SOLR_DOCS_CORE_NAME-nm3clol_core} + - SOLR_LAW_CORE_NAME=${SOLR_LAW_CORE_NAME-vacode_core} + # - SOLR_CORE=my_core restart: unless-stopped ports: - "${SOLR_DOCS_PORT-8983}:8983" volumes: - solr-data:/var/solr -# environment: -# - SOLR_CORE=my_core command: # - /bin/sh -c "chown -R 8983:8983 /var/solr" - solr-precreate @@ -232,7 +240,7 @@ configs: file: ../solr-log4j2.xml solr_nm3clol_core_properties: content: | - name=nm3clol_core + name=${SOLR_DOCS_CORE_NAME-nm3clol_core} solr_nm3clol_core_solrconfig: file: ../solr-data/nm3clol_core/conf/solrconfig.xml solr_nm3clol_core_managed_schema: @@ -323,7 +331,7 @@ configs: file: ../solr-data/nm3clol_core/conf/synonyms.txt solr_vacode_core_properties: content: | - name=vacode_core + name=${SOLR_LAW_CORE_NAME-vacode_core} solr_vacode_core_solrconfig: file: ../solr-data/vacode_core/conf/solrconfig.xml solr_vacode_core_managed_schema: diff --git a/solr/README.md b/solr/README.md new file mode 100644 index 0000000..4fcdc6a --- /dev/null +++ b/solr/README.md @@ -0,0 +1,19 @@ +# Solr + +This Docker Compose configuration contains the minimum requirement for running Solr standalone. + +## Starting Up + +To run it using you own configuration: + + docker compose --env-file ../.env up -d + +Or to run it using the default development configuration: + + docker compose --env-file ../.env.example up -d + +## Shutting Down + +To stop it use: + + docker compose down diff --git a/solr/docker-compose.yml b/solr/docker-compose.yml index 502dc86..8248338 100644 --- a/solr/docker-compose.yml +++ b/solr/docker-compose.yml @@ -13,13 +13,21 @@ services: - solr-init image: solr:latest container_name: solr + env_file: + - path: ../.env.example + required: false + - path: ../.env + required: false + environment: + - SOLR_DOCS_PORT=${SOLR_DOCS_PORT-8983} + - SOLR_DOCS_CORE_NAME=${SOLR_DOCS_CORE_NAME-nm3clol_core} + - SOLR_LAW_CORE_NAME=${SOLR_LAW_CORE_NAME-vacode_core} + # - SOLR_CORE=my_core restart: unless-stopped ports: - "${SOLR_DOCS_PORT-8983}:8983" volumes: - solr-data:/var/solr -# environment: -# - SOLR_CORE=my_core command: # - /bin/sh -c "chown -R 8983:8983 /var/solr" - solr-precreate @@ -213,7 +221,7 @@ configs: file: ../solr-log4j2.xml solr_nm3clol_core_properties: content: | - name=nm3clol_core + name=${SOLR_DOCS_CORE_NAME-nm3clol_core} solr_nm3clol_core_solrconfig: file: ../solr-data/nm3clol_core/conf/solrconfig.xml solr_nm3clol_core_managed_schema: @@ -304,7 +312,7 @@ configs: file: ../solr-data/nm3clol_core/conf/synonyms.txt solr_vacode_core_properties: content: | - name=vacode_core + name=${SOLR_LAW_CORE_NAME-vacode_core} solr_vacode_core_solrconfig: file: ../solr-data/vacode_core/conf/solrconfig.xml solr_vacode_core_managed_schema: diff --git a/tika/README.md b/tika/README.md new file mode 100644 index 0000000..7737e1b --- /dev/null +++ b/tika/README.md @@ -0,0 +1,15 @@ +# Tika + +This Docker Compose configuration contains the minimum requirement for running Tika standalone. + +## Starting Up + +Or to run it using the default configuration: + + docker compose up -d + +## Shutting Down + +To stop it use: + + docker compose down