Merge branch 'main' into move-helm-charts

aerospike · Jun 17, 2024 · b7817cb · b7817cb
2 parents 23a1313 + e4af17e
commit b7817cb
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 13 deletions.
diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
@@ -0,0 +1,43 @@
+services:
+  aerospike:
+    image: aerospike/aerospike-server-enterprise:7.0.0.2
+    ports:
+      - "3000:3000"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+    command:
+      - "--config-file"
+      - "/opt/aerospike/etc/aerospike/aerospike.conf"
+  avs:
+    image: aerospike/aerospike-proximus:0.4.0
+    # ports:
+      # - "5000:5000"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile-prism
+    develop:
+      watch:
+        - path: ./prism
+          action: rebuild
+    image: prism
+    ports:
+      - "8080:8080"
+    networks:
+      - avs-demo
+    environment:
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
+    volumes:
+      - ./container-volumes/prism/images:/prism/static/images/data
+
+networks:
+  avs-demo: {}
diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
@@ -17,16 +17,18 @@ services:
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/avs:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
   app:
-    image: prism
+    image: aerospike/prism-search-example:latest
     ports:
       - "8080:8080"
     networks:
       - avs-demo
     environment:
-      - AVS_HOST=avs
-      - AVS_PORT=5000
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
     volumes:
       - ./container-volumes/prism/images:/prism/static/images/data
 

diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
@@ -0,0 +1,44 @@
+services:
+  aerospike:
+    image: aerospike/aerospike-server-enterprise:7.0.0.2
+    # ports:
+    #   - "3000:3000"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+    command:
+      - "--config-file"
+      - "/opt/aerospike/etc/aerospike/aerospike.conf"
+  avs:
+    image: aerospike/aerospike-proximus:0.4.0
+    # ports:
+    #   - "5002:5002"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile-quote-search
+    develop:
+      watch:
+        - path: ./quote-search
+          action: rebuild
+    image: quote-search
+    ports:
+      - "8080:8080"
+    networks:
+      - avs-demo
+    volumes:
+      - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
+      # ./usr/local/lib/python3.10/dist-packages/sentence_transformers
+    environment:
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
+
+networks:
+  avs-demo: {}
diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     volumes:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
   app:
-    image: quote-search
+    image: aerospike/quote-search-example:latest
     ports:
       - "8080:8080"
     networks:
@@ -28,14 +28,10 @@ services:
       - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
       # ./usr/local/lib/python3.10/dist-packages/sentence_transformers
     environment:
-      - AVS_HOST=avs
-      - AVS_PORT=5000
-      - APP_NUM_QUOTES=5000
-      - GRPC_DNS_RESOLVER=native
+      AVS_HOST: avs
+      AVS_PORT: "5000"
+      APP_NUM_QUOTES: "5000"
+      GRPC_DNS_RESOLVER: native
 
-
 networks:
   avs-demo: {}
-
-volumes:
- app_data: {}