Merge pull request #12 from LPilogue/develop

Refactor: docker-compose.yml 모두 환경변수로 교체

Author: wlswnsdn

.github/workflows/docker-image-CD.yml

@@ -42,4 +42,26 @@ jobs:
 
       # flask-app만 다시 실행
       - name: Run Docker compose
-        run: docker compose rm -f flask-app && docker compose up -d flask-app
+        env:
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          DB_HOST: ${{ secrets.DB_HOST }}
+          DB_NAME: ${{ secrets.DB_NAME }}
+          FILE_SERVER_URL: ${{ secrets.FILE_SERVER_URL }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
+          SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
+          YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }}
+          ROOT_PASSWORD: ${{ secrets.ROOT_PASSWORD }}
+        run: |
+          echo "DB_USER=$DB_USER" >> .env
+          echo "DB_PASSWORD=$DB_PASSWORD" >> .env
+          echo "DB_HOST=$DB_HOST" >> .env
+          echo "DB_NAME=$DB_NAME" >> .env
+          echo "FILE_SERVER_URL=FILE_SERVER_URL" >> .env
+          echo "GOOGLE_API_KEY=$GOOGLE_API_KEY" >> .env
+          echo "SPOTIFY_CLIENT_ID=$SPOTIFY_CLIENT_ID" >> .env
+          echo "SPOTIFY_CLIENT_SECRET=$SPOTIFY_CLIENT_SECRET" >> .env
+          echo "YOUTUBE_API_KEY=$YOUTUBE_API_KEY" >> .env
+          echo "ROOT_PASSWORD=$ROOT_PASSWORD" >> .env
+          docker compose rm -f flask-app && docker compose up -d flask-app

app/resource/server.py

@@ -8,7 +8,7 @@
 # 환경 변수에서 설정 불러오기
 DB_CONFIG = {
     'host': os.getenv('DB_HOST'),
-    'port': int(os.getenv('DB_PORT', 3306)),  # 기본값 설정
+    'port': 3306,
     'user': os.getenv('DB_USER'),
     'password': os.getenv('DB_PASSWORD'),
     'database': os.getenv('DB_NAME')

app/routes/recommend.py

@@ -39,7 +39,7 @@ def cocktail_recommendation():
         if cocktail is None:
             return jsonify({"error": "No cocktail provided."}), 400
 
-        return jsonify(cocktail)
+        return jsonify(emotions[0], cocktail)
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 

docker-compose.yml

@@ -10,7 +10,9 @@ services:
       BE_PORT: "8080"
       REC_HOST: "lpilogue-rec"
       REC_PORT: "5000"
-
+    depends_on:
+      - spring-boot-app
+      - flask-app
 
   spring-boot-app:
     container_name: lpilogue-be
@@ -22,8 +24,8 @@ services:
       SPRING_PROFILES_ACTIVE: "prod"
       SPRING_DATASOURCE_URL: jdbc:mysql://lpilogue-db:3306/lpilogue?serverTimezone=Asia/Seoul&useSSL=false&allowPublicKeyRetrieval=true
       #      SPRING_DATASOURCE_URL: jdbc:mysql://lpilogue-db.c5msg0qqmmcw.ap-northeast-2.rds.amazonaws.com:3306/lpilogue?serverTimezone=Asia/Seoul&useSSL=false&allowPublicKeyRetrieval=true
-      SPRING_DATASOURCE_USERNAME: admin
-      SPRING_DATASOURCE_PASSWORD: dnwnswls2501
+      SPRING_DATASOURCE_USERNAME: ${DB_USER}
+      SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD}
       TZ: Asia/Seoul
     depends_on:
       - mysql-app
@@ -33,10 +35,10 @@ services:
     image: mysql:8
     restart: always
     environment:
-      MYSQL_DATABASE: lpilogue
-      MYSQL_ROOT_PASSWORD: rootpassword
-      MYSQL_USER: admin
-      MYSQL_PASSWORD: dnwnswls2501
+      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_ROOT_PASSWORD: ${ROOT_PASSWORD}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
       TZ: Asia/Seoul
     ports:
       - "3306:3306"
@@ -49,6 +51,15 @@ services:
     image: hadoroke/lpilogue-rec:latest
     environment:
       TZ: Asia/Seoul
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_HOST: ${DB_HOST}
+      DB_NAME: ${DB_NAME}
+      FILE_SERVER_URL: ${FILE_SERVER_URL}
+      GOOGLE_API_KEY: ${GOOGLE_API_KEY}
+      SPOTIFY_CLIENT_ID: ${SPOTIFY_CLIENT_ID}
+      SPOTIFY_CLIENT_SECRET: ${SPOTIFY_CLIENT_SECRET}
+      YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
     ports:
       - "59999:5000"
     depends_on: