chore(notes): move notes service to backend/simple directory

EchoSkorJjj · Feb 25, 2024 · 3b6665d · 3b6665d
1 parent a7ac5ac
commit 3b6665d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/notes/.gitignore → backend/simple/notes/.gitignore b/notes/.gitignore → backend/simple/notes/.gitignore
diff --git a/notes/Dockerfile → backend/simple/notes/Dockerfile b/notes/Dockerfile → backend/simple/notes/Dockerfile
diff --git a/notes/example_note.pdf → backend/simple/notes/example_note.pdf b/notes/example_note.pdf → backend/simple/notes/example_note.pdf
diff --git a/notes/instructions.txt → backend/simple/notes/instructions.txt b/notes/instructions.txt → backend/simple/notes/instructions.txt
diff --git a/notes/note_client.py → backend/simple/notes/note_client.py b/notes/note_client.py → backend/simple/notes/note_client.py
diff --git a/notes/note_upload_service.py → backend/simple/notes/note_upload_service.py b/notes/note_upload_service.py → backend/simple/notes/note_upload_service.py
diff --git a/notes/notes.proto → backend/simple/notes/notes.proto b/notes/notes.proto → backend/simple/notes/notes.proto
diff --git a/notes/notes_pb2.py → backend/simple/notes/notes_pb2.py b/notes/notes_pb2.py → backend/simple/notes/notes_pb2.py
diff --git a/notes/notes_pb2_grpc.py → backend/simple/notes/notes_pb2_grpc.py b/notes/notes_pb2_grpc.py → backend/simple/notes/notes_pb2_grpc.py
diff --git a/notes/requirements.txt → backend/simple/notes/requirements.txt b/notes/requirements.txt → backend/simple/notes/requirements.txt
diff --git a/notes/test_s3_connection.py → backend/simple/notes/test_s3_connection.py b/notes/test_s3_connection.py → backend/simple/notes/test_s3_connection.py
diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -62,21 +62,21 @@ services:
       timeout: 5s
       retries: 5
 
-  # notes-db:
-  #   image: mysql:latest
-  #   environment:
-  #     - MYSQL_ROOT_PASSWORD=root
-  #     - MYSQL_DATABASE=my_notes_app
-  #   ports:
-  #     - "3306:3306"
-  #   volumes:
-  #     - notes-db-volume:/var/lib/mysql
-  #     - ../sql_table/create_notes_table.sql:/docker-entrypoint-initdb.d/create_notes_table.sql
-  #   healthcheck:
-  #     test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-proot"]
-  #     interval: 10s
-  #     timeout: 5s
-  #     retries: 5
+  notes-db:
+    image: mysql:latest
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=my_notes_app
+    ports:
+      - "3306:3306"
+    volumes:
+      - notes-db-volume:/var/lib/mysql
+      - ../sql_table/create_notes_table.sql:/docker-entrypoint-initdb.d/create_notes_table.sql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-proot"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   user-redis:
     image: redis:7.2-rc2-alpine3.18
@@ -87,15 +87,15 @@ services:
       timeout: 5s
       retries: 5
 
-  # notes-service:
-  #   build: ../../notes
-  #   depends_on:
-  #     kong-gateway:
-  #       condition: service_healthy
-  #     notes-db:
-  #       condition: service_healthy
-  #   ports:
-  #     - "50052:50052"      
+  notes-service:
+    build: ../../backend/simple/notes
+    depends_on:
+      kong-gateway:
+        condition: service_healthy
+      notes-db:
+        condition: service_healthy
+    ports:
+      - "50052:50052"      
 
   user-storage-service:
     build: ../../backend/simple/user-storage