From 5183918f901457104b8952d1859378caca3d0cfa Mon Sep 17 00:00:00 2001 From: David Gerchikov Date: Sun, 9 Jun 2024 11:13:10 +0300 Subject: [PATCH 1/3] Fix docker-compose --- prism-image-search/docker-compose.yml | 13 +++++++++++-- quote-semantic-search/docker-compose.yml | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml index 030521b..fa59cb1 100644 --- a/prism-image-search/docker-compose.yml +++ b/prism-image-search/docker-compose.yml @@ -19,14 +19,23 @@ services: volumes: - ./container-volumes/avs/etc/avs:/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 + 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.yml b/quote-semantic-search/docker-compose.yml index 65c3fec..5cc6f6f 100644 --- a/quote-semantic-search/docker-compose.yml +++ b/quote-semantic-search/docker-compose.yml @@ -19,6 +19,13 @@ services: 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" @@ -28,14 +35,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: {} \ No newline at end of file From 239221a49829894a701877d372aed4eb6c4f375c Mon Sep 17 00:00:00 2001 From: David Gerchikov Date: Mon, 10 Jun 2024 20:07:39 +0300 Subject: [PATCH 2/3] commit --- prism-image-search/docker-compose-dev.yml | 43 +++++++++++++++++++ prism-image-search/docker-compose.yml | 9 +--- quote-semantic-search/docker-compose-dev.yml | 44 ++++++++++++++++++++ quote-semantic-search/docker-compose.yml | 9 +--- 4 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 prism-image-search/docker-compose-dev.yml create mode 100644 quote-semantic-search/docker-compose-dev.yml diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml new file mode 100644 index 0000000..fa59cb1 --- /dev/null +++ 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/avs:/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 index fa59cb1..8a7fc52 100644 --- a/prism-image-search/docker-compose.yml +++ b/prism-image-search/docker-compose.yml @@ -19,14 +19,7 @@ services: volumes: - ./container-volumes/avs/etc/avs:/etc/aerospike-proximus app: - build: - context: . - dockerfile: Dockerfile-prism - develop: - watch: - - path: ./prism - action: rebuild - image: prism + image: aerospike/prism-search-example:latest ports: - "8080:8080" networks: diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml new file mode 100644 index 0000000..5cc6f6f --- /dev/null +++ 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 index 5cc6f6f..021a5fa 100644 --- a/quote-semantic-search/docker-compose.yml +++ b/quote-semantic-search/docker-compose.yml @@ -19,14 +19,7 @@ services: 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 + image: aerospike/quote-search-example:latest ports: - "8080:8080" networks: From 6abe476e58e2fc59a565a30b19aa40bbc7537133 Mon Sep 17 00:00:00 2001 From: David Gerchikov Date: Tue, 11 Jun 2024 21:11:58 +0300 Subject: [PATCH 3/3] commit --- prism-image-search/docker-compose-dev.yml | 2 +- prism-image-search/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml index fa59cb1..046fb8c 100644 --- a/prism-image-search/docker-compose-dev.yml +++ b/prism-image-search/docker-compose-dev.yml @@ -17,7 +17,7 @@ services: networks: - avs-demo volumes: - - ./container-volumes/avs/etc/avs:/etc/aerospike-proximus + - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus app: build: context: . diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml index 8a7fc52..a455072 100644 --- a/prism-image-search/docker-compose.yml +++ b/prism-image-search/docker-compose.yml @@ -17,7 +17,7 @@ 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: aerospike/prism-search-example:latest ports: