From 286d7cc6e4d7c24dd059fd4b97e837e10fb853fe Mon Sep 17 00:00:00 2001 From: Joe Martin Date: Mon, 28 Oct 2024 15:01:55 -0700 Subject: [PATCH] Update Docker Compose files and README.md --- prism-image-search/README.md | 5 +++-- prism-image-search/docker-compose-dev.yml | 5 ++++- quote-semantic-search/README.md | 6 ++++-- quote-semantic-search/docker-compose-dev.yml | 9 +++++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/prism-image-search/README.md b/prism-image-search/README.md index ddbc113..711ec21 100644 --- a/prism-image-search/README.md +++ b/prism-image-search/README.md @@ -67,8 +67,9 @@ docker build -t prism . -f Dockerfile-prism ``` ### 2. Add features.conf AVS needs an Aerospike features.conf file with the vector-search feature enabled. -You can set the `features.conf` location in an environment variable: `FEATURE_KEY' -or add your features.conf file to `container-volumes/avs/etc/aerospike-vector-search` +Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file. + +If no variable is set it will expect the features.conf to be in `container-volumes/avs/etc/aerospike-vector-search` ### 3. Start the environment ``` diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml index 8ebbe1e..b2c7392 100644 --- a/prism-image-search/docker-compose-dev.yml +++ b/prism-image-search/docker-compose-dev.yml @@ -20,6 +20,8 @@ services: retries: 10 avs: image: aerospike/aerospike-vector-search:0.10.0 + environment: + FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}" depends_on: aerospike: condition: service_healthy @@ -27,13 +29,14 @@ services: - avs-demo volumes: - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search + - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro healthcheck: test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"] interval: 5s timeout: 20s retries: 10 app: - image: prism:latest + image: "prism:latest" depends_on: avs: condition: service_healthy diff --git a/quote-semantic-search/README.md b/quote-semantic-search/README.md index 4fa32b3..f0481c0 100644 --- a/quote-semantic-search/README.md +++ b/quote-semantic-search/README.md @@ -57,8 +57,10 @@ docker build -t quote-search . -f Dockerfile-quote-search ### 2. Add features.conf AVS needs an Aerospike features.conf file with the vector-search feature enabled. -You can set the `features.conf` location in an environment variable: `FEATURE_KEY' -or add your features.conf file to `container-volumes/avs/etc/aerospike-vector-search` +Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file. + +If no variable is set it will expect the features.conf to be in `container-volumes/avs/etc/aerospike-vector-search` + ### 3. Start the environment diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml index e4e38fc..bab6bfa 100644 --- a/quote-semantic-search/docker-compose-dev.yml +++ b/quote-semantic-search/docker-compose-dev.yml @@ -19,23 +19,24 @@ services: timeout: 20s retries: 10 avs: + image: aerospike/aerospike-vector-search:0.10.0 + environment: + FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}" depends_on: aerospike: condition: service_healthy - image: aerospike/aerospike-vector-search:0.10.0 - # ports: - # - "5002:5002" networks: - avs-demo volumes: - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search + - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro healthcheck: test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"] interval: 5s timeout: 20s retries: 10 app: - image: quote-search:latest + image: "quote-search:latest" depends_on: avs: condition: service_healthy