From 614184da5f7620d922a76064cfb6d57c89232b55 Mon Sep 17 00:00:00 2001 From: Kieran Date: Tue, 27 Aug 2024 13:46:53 +0100 Subject: [PATCH 1/2] feat(docker): add qdrant (#200) * feat(docker): add qdrant * fix restore on docker monolithic --- templates/docker-compose/.env | 2 ++ templates/docker-compose/Makefile.dist | 3 +++ templates/docker-compose/backup.sh | 3 +++ templates/docker-compose/docker-compose.prod.yml | 4 ++++ templates/docker-compose/docker-compose.yml | 11 +++++++++++ templates/docker-compose/restore.sh | 5 ++++- templates/docker-monolithic/backup.sh | 3 +++ templates/docker-monolithic/create_volumes.sh | 1 + templates/docker-monolithic/docker-compose.yml | 4 ++++ templates/docker-monolithic/restore.sh | 3 +++ 10 files changed, 38 insertions(+), 1 deletion(-) diff --git a/templates/docker-compose/.env b/templates/docker-compose/.env index 0d8e756..6fadf99 100644 --- a/templates/docker-compose/.env +++ b/templates/docker-compose/.env @@ -20,6 +20,7 @@ CACHE_VOLUME=supportpal_cache MAILER_VOLUME=supportpal_mailer ADDONS_VOLUME=supportpal_addons MEILISEARCH_VOLUME=supportpal_meilisearch +QDRANT_VOLUME=supportpal_qdrant # Services WEB_SERVICE_NAME=supportpal @@ -31,6 +32,7 @@ CRON_SERVICE_NAME=supportpal_cron WS_SERVICE_NAME=supportpal_ws MQ_SERVICE_NAME=supportpal_mq MEILISEARCH_SERVICE_NAME=meilisearch +QDRANT_SERVICE_NAME=qdrant # Misc APP_VERSION=5.3.1 diff --git a/templates/docker-compose/Makefile.dist b/templates/docker-compose/Makefile.dist index 429ec7a..9dfeba9 100644 --- a/templates/docker-compose/Makefile.dist +++ b/templates/docker-compose/Makefile.dist @@ -48,6 +48,8 @@ uninstall: ## Irreversibly uninstall the help desk and all associated data. $(DOCKER_BIN) volume remove $(CACHE_VOLUME) $(DOCKER_BIN) volume remove $(MAILER_VOLUME) $(DOCKER_BIN) volume remove $(ADDONS_VOLUME) + $(DOCKER_BIN) volume remove $(MEILISEARCH_VOLUME) + $(DOCKER_BIN) volume remove $(QDRANT_VOLUME) rm -rf secrets .PHONY: create_volumes @@ -59,6 +61,7 @@ create_volumes: $(DOCKER_BIN) volume create --name $(MAILER_VOLUME) $(DOCKER_BIN) volume create --name $(ADDONS_VOLUME) $(DOCKER_BIN) volume create --name $(MEILISEARCH_VOLUME) + $(DOCKER_BIN) volume create --name $(QDRANT_VOLUME) .PHONY: create_secrets create_secrets: diff --git a/templates/docker-compose/backup.sh b/templates/docker-compose/backup.sh index 116e917..dc43c61 100644 --- a/templates/docker-compose/backup.sh +++ b/templates/docker-compose/backup.sh @@ -30,6 +30,9 @@ mkdir -p "backup/${TIMESTAMP}/volumes-compose/mailer/" && docker cp "${MAILER_SE if [[ "$(docker ps -aq -f name="${MEILISEARCH_SERVICE_NAME}")" ]]; then mkdir -p "backup/${TIMESTAMP}/volumes-compose/meilisearch/" && docker cp "${MEILISEARCH_SERVICE_NAME}:/meili_data" "backup/${TIMESTAMP}/volumes-compose/meilisearch" fi +if [[ "$(docker ps -aq -f name="${QDRANT_SERVICE_NAME}")" ]]; then + mkdir -p "backup/${TIMESTAMP}/volumes-compose/qdrant/" && docker cp "${QDRANT_SERVICE_NAME}:/qdrant" "backup/${TIMESTAMP}/volumes-compose/qdrant" +fi docker cp "backup/${TIMESTAMP}/volumes-compose/" "${WEB_SERVICE_NAME}:${TEMP_BACKUP_DIR}/" rm -rf "backup/${TIMESTAMP}/" diff --git a/templates/docker-compose/docker-compose.prod.yml b/templates/docker-compose/docker-compose.prod.yml index c6746db..d50c90d 100644 --- a/templates/docker-compose/docker-compose.prod.yml +++ b/templates/docker-compose/docker-compose.prod.yml @@ -92,6 +92,10 @@ services: env_file: - .env.custom + qdrant: + env_file: + - .env.custom + volumes: supportpal_resources: supportpal_app: diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 8a1e72d..8795ca1 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -153,6 +153,14 @@ services: networks: - supportpal_backend + qdrant: + container_name: ${QDRANT_SERVICE_NAME} + image: qdrant/qdrant:v1.10.1 + volumes: + - supportpal_qdrant:/qdrant + networks: + - supportpal_backend + volumes: supportpal_db: external: true @@ -163,6 +171,9 @@ volumes: supportpal_meilisearch: external: true name: ${MEILISEARCH_VOLUME} + supportpal_qdrant: + external: true + name: ${QDRANT_VOLUME} networks: supportpal_frontend: diff --git a/templates/docker-compose/restore.sh b/templates/docker-compose/restore.sh index 4db603c..d1ed292 100644 --- a/templates/docker-compose/restore.sh +++ b/templates/docker-compose/restore.sh @@ -42,6 +42,9 @@ if echo "${TAR_OUTPUT}" | grep -qs '^volumes-compose/$'; then docker cp "backup/${TIMESTAMP}/volumes-compose/mailer/exim4/" "${MAILER_SERVICE_NAME}:/var/spool/" if echo "${TAR_OUTPUT}" | grep -qs '^volumes-compose/meilisearch'; then docker cp "backup/${TIMESTAMP}/volumes-compose/meilisearch/meili_data" "${MEILISEARCH_SERVICE_NAME}:/" - fi + fi + if echo "${TAR_OUTPUT}" | grep -qs '^volumes-compose/qdrant'; then + docker cp "backup/${TIMESTAMP}/volumes-compose/qdrant/qdrant" "${QDRANT_SERVICE_NAME}:/" + fi rm -rf "backup/${TIMESTAMP}/" fi diff --git a/templates/docker-monolithic/backup.sh b/templates/docker-monolithic/backup.sh index fc93360..505b559 100644 --- a/templates/docker-monolithic/backup.sh +++ b/templates/docker-monolithic/backup.sh @@ -56,6 +56,9 @@ docker exec -u root supportpal bash -c "mkdir -p ${TEMP_BACKUP_DIR}/volumes-mono if docker exec -u root supportpal bash -c "test -d /meilisearch"; then docker exec -u root supportpal bash -c "mkdir -p ${TEMP_BACKUP_DIR}/volumes-monolithic/meilisearch && cp -r /meilisearch/ ${TEMP_BACKUP_DIR}/volumes-monolithic/meilisearch" fi +if docker exec -u root supportpal bash -c "test -d /qdrant"; then + docker exec -u root supportpal bash -c "mkdir -p ${TEMP_BACKUP_DIR}/volumes-monolithic/qdrant && cp -r /qdrant/ ${TEMP_BACKUP_DIR}/volumes-monolithic/qdrant" +fi echo 'Combining backups...' docker exec -u root supportpal bash -c "cd ${TEMP_BACKUP_DIR} && tar -czf ${APP_BACKUP_NAME} ${FILESYSTEM_BACKUP_NAME} ${DB_FILE_NAME} volumes-monolithic/" diff --git a/templates/docker-monolithic/create_volumes.sh b/templates/docker-monolithic/create_volumes.sh index 583a465..fe64e89 100644 --- a/templates/docker-monolithic/create_volumes.sh +++ b/templates/docker-monolithic/create_volumes.sh @@ -16,3 +16,4 @@ create_volume supportpal_logs create_volume supportpal_addons create_volume supportpal_caddy create_volume supportpal_meilisearch +create_volume supportpal_qdrant diff --git a/templates/docker-monolithic/docker-compose.yml b/templates/docker-monolithic/docker-compose.yml index 7ea4e68..2718212 100644 --- a/templates/docker-monolithic/docker-compose.yml +++ b/templates/docker-monolithic/docker-compose.yml @@ -19,6 +19,7 @@ services: - supportpal_addons:/var/www/supportpal/addons - supportpal_caddy:/caddy - supportpal_meilisearch:/meilisearch + - supportpal_qdrant:/qdrant volumes: supportpal_db: @@ -45,3 +46,6 @@ volumes: supportpal_meilisearch: external: true name: supportpal_meilisearch + supportpal_qdrant: + external: true + name: supportpal_qdrant diff --git a/templates/docker-monolithic/restore.sh b/templates/docker-monolithic/restore.sh index 31c04f3..7060f15 100644 --- a/templates/docker-monolithic/restore.sh +++ b/templates/docker-monolithic/restore.sh @@ -44,6 +44,9 @@ if echo "${TAR_OUTPUT}" | grep -qs '^volumes-monolithic/$'; then if echo "${TAR_OUTPUT}" | grep -qs '^volumes-monolithic/meilisearch'; then docker exec -u root supportpal bash -c "cp -r ${TEMP_BACKUP_DIR}/volumes-monolithic/meilisearch/meilisearch /" fi + if echo "${TAR_OUTPUT}" | grep -qs '^volumes-monolithic/qdrant'; then + docker exec -u root supportpal bash -c "cp -r ${TEMP_BACKUP_DIR}/volumes-monolithic/qdrant/qdrant /" + fi rm -rf "backup/${TIMESTAMP}/" fi From 00347f0c790f357396d02da7999a6f2efdf6c984 Mon Sep 17 00:00:00 2001 From: Kieran Date: Tue, 27 Aug 2024 13:50:50 +0100 Subject: [PATCH 2/2] Update default APP_VERSION to 5.4.0 (#205) --- templates/docker-compose/.env | 2 +- templates/docker-monolithic/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/docker-compose/.env b/templates/docker-compose/.env index 6fadf99..8593fd7 100644 --- a/templates/docker-compose/.env +++ b/templates/docker-compose/.env @@ -35,7 +35,7 @@ MEILISEARCH_SERVICE_NAME=meilisearch QDRANT_SERVICE_NAME=qdrant # Misc -APP_VERSION=5.3.1 +APP_VERSION=5.4.0 # Secrets CONFIGURATOR_VERSION=latest diff --git a/templates/docker-monolithic/docker-compose.yml b/templates/docker-monolithic/docker-compose.yml index 2718212..57290ae 100644 --- a/templates/docker-monolithic/docker-compose.yml +++ b/templates/docker-monolithic/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.8' services: supportpal: container_name: supportpal - image: 'public.ecr.aws/supportpal/helpdesk-monolithic:5.3.1' + image: 'public.ecr.aws/supportpal/helpdesk-monolithic:5.4.0' restart: always stop_grace_period: 60s ports: