deploy: add flashcards-settings-server

crowdproj · Oct 27, 2024 · 715c652 · 715c652
1 parent 6360e42
commit 715c652
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/tutor-deploy/build-images.bat b/tutor-deploy/build-images.bat
@@ -3,16 +3,19 @@
 docker stop tutor-deploy-flashcards-tts-server-1
 docker stop tutor-deploy-flashcards-cards-server-1
 docker stop tutor-deploy-flashcards-dictionaries-server-1
+docker stop tutor-deploy-flashcards-settings-server-1
 docker stop tutor-deploy-flashcards-app-1
 
 docker rm tutor-deploy-flashcards-tts-server-1
 docker rm tutor-deploy-flashcards-cards-server-1
 docker rm tutor-deploy-flashcards-dictionaries-server-1
+docker rm tutor-deploy-flashcards-settings-server-1
 docker rm tutor-deploy-flashcards-app-1
 
 docker rmi sszuev/open-tutor-tts-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor-cards-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor-dictionaries-server:2.0.0-snapshot
+docker rmi sszuev/open-tutor-settings-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor:2.0.0-snapshot
 
 cd ..
@@ -28,6 +31,9 @@ call gradle dockerBuildImage
 cd ../app-dictionaries
 call gradle dockerBuildImage
 
+cd ../app-settings
+call gradle dockerBuildImage
+
 cd ../app-ktor
 call gradle dockerBuildImage
 

diff --git a/tutor-deploy/build-images.sh b/tutor-deploy/build-images.sh
@@ -3,16 +3,19 @@
 docker stop tutor-deploy-flashcards-tts-server-1
 docker stop tutor-deploy-flashcards-cards-server-1
 docker stop tutor-deploy-flashcards-dictionaries-server-1
+docker stop tutor-deploy-flashcards-settings-server-1
 docker stop tutor-deploy-flashcards-app-1
 
 docker rm tutor-deploy-flashcards-tts-server-1
 docker rm tutor-deploy-flashcards-cards-server-1
 docker rm tutor-deploy-flashcards-dictionaries-server-1
+docker rm tutor-deploy-flashcards-settings-server-1
 docker rm tutor-deploy-flashcards-app-1
 
 docker rmi sszuev/open-tutor-tts-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor-cards-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor-dictionaries-server:2.0.0-snapshot
+docker rmi sszuev/open-tutor-settings-server:2.0.0-snapshot
 docker rmi sszuev/open-tutor:2.0.0-snapshot
 
 cd ..
@@ -23,6 +26,8 @@ cd ../app-cards
 gradle dockerBuildImage
 cd ../app-dictionaries
 gradle dockerBuildImage
+cd ../app-settings
+gradle dockerBuildImage
 cd ../app-ktor
 gradle dockerBuildImage
 cd ../tutor-deploy
diff --git a/tutor-deploy/docker-compose-app.yml b/tutor-deploy/docker-compose-app.yml
@@ -144,6 +144,23 @@ services:
       DB_PG_USER: ${POSTGRES_DEFAULT_USER}
       DB_PG_PWD: ${POSTGRES_DEFAULT_PASS}
 
+  flashcards-settings-server:
+    image: sszuev/open-tutor-settings-server:2.0.0-snapshot
+    networks:
+      - flashcards-net
+    depends_on:
+      flashcards-nats:
+        condition: service_healthy
+      flashcards-db:
+        condition: service_healthy
+      flashcards-cards-server:
+        condition: service_started
+    environment:
+      SETTINGS_SERVER_NATS_HOST: "flashcards-nats"
+      DB_PG_URL: "jdbc:postgresql://flashcards-db:5432/flashcards"
+      DB_PG_USER: ${POSTGRES_DEFAULT_USER}
+      DB_PG_PWD: ${POSTGRES_DEFAULT_PASS}
+
   flashcards-app:
     image: sszuev/open-tutor:2.0.0-snapshot
     networks:
@@ -152,6 +169,7 @@ services:
       - flashcards-tts-server
       - flashcards-cards-server
       - flashcards-dictionaries-server
+      - flashcards-settings-server
       - flashcards-envoy
     environment:
       CLIENT_NATS_HOST: "flashcards-nats"