DevOps 수정

Author: ming0o

.github/workflows/deploy-frontend.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup Node.js    # Node.js 설정 추가
       uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
 
     - name: Check SERVER_IP
       run: echo "SERVER_IP = ${{ secrets.SERVER_IP }}"

DevOps/.env.dev

@@ -0,0 +1,2 @@
+SSL_CERT_PATH=/etc/letsencrypt/live/tukcbu.com/fullchain.pem
+SSL_KEY_PATH=/etc/letsencrypt/live/tukcbu.com/privkey.pem

DevOps/.gitignore

@@ -1,5 +1,4 @@
 # 환경변수 파일
-.env.*
 config/*
 
 # nginx 빌드 후 파일

DevOps/docker-compose.yml

@@ -1,12 +1,17 @@
 version: "3.8"
 
 services:
+  frontend:
+    build: ../frontend
+    container_name: frontend
+    expose:
+      - "80"
+
   backend:
     build: ../backend
     container_name: backend
-    image: souljump/cbumanage
-    expose:
-      - "8080"
+    ports:
+      - "8080:8080"
     env_file:
       - .env.dev
     volumes:
@@ -15,26 +20,28 @@ services:
     depends_on:
       - redis
 
+  redis:
+    image: redis:latest
+    container_name: redis
+    networks:
+      - cbu-net
+
   nginx:
     build:
-      context: ../
-      dockerfile: DevOps/nginx/Dockerfile
+      context: ./nginx
+      dockerfile: Dockerfile
     container_name: nginx
     ports:
       - "443:443"
       - "80:80"
     env_file:
-      - .env.dev    # dev 서버
+      - .env.dev
     depends_on:
+      - frontend
       - backend
     volumes:
       - /etc/letsencrypt:/etc/letsencrypt:ro
 
-  redis:
-    image: redis:latest
-    container_name: redis
-    networks:
-      - cbu-net
 networks:
   cbu-net:
     driver: bridge

DevOps/nginx/Dockerfile

@@ -1,11 +1,6 @@
 FROM nginx:stable-alpine
-
 WORKDIR /etc/nginx
 
-# SSL 인증서 복사
-COPY ssl /etc/nginx/ssl
-
-# 설정파일 복사
 COPY default.conf.template /etc/nginx/conf.d/default.conf.template
 
 CMD ["/bin/sh", "-c", "envsubst '$$SSL_CERT_PATH $$SSL_KEY_PATH' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"]

DevOps/nginx/default.conf

@@ -5,21 +5,21 @@ server {
     ssl_certificate     ${SSL_CERT_PATH};
     ssl_certificate_key ${SSL_KEY_PATH};
 
-    location /api/ {
-        proxy_pass http://backend:8080;
+    location /api/v1/ {
+        proxy_pass http://backend:8080/api/v1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     location / {
-        root /usr/share/nginx/html;
-        index index.html;
-        try_files $uri $uri/ /index.html;
+        proxy_pass http://frontend:80;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
     }
 }
 
 server {
     listen 80;
     server_name tukcbu.com www.tukcbu.com;
     return 301 https://$host$request_uri;
-}
+}

DevOps/nginx/default.conf.template

@@ -1,8 +1,24 @@
-FROM openjdk:17
-WORKDIR /backend
+FROM eclipse-temurin:17-jdk AS build
 
-COPY build/libs/cbuManage-0.0.1-SNAPSHOT.jar app.jar
+WORKDIR /app
 
-EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "app.jar"]
+# Gradle wrapper 복사
+COPY gradlew .
+COPY gradle gradle
+
+# 소스 복사
+COPY build.gradle .
+COPY settings.gradle .
+COPY src src
+
+# 🔥 반드시 clean 포함해서 빌드
+RUN ./gradlew clean build -x test --no-daemon
+
+# -----------------------------------
+FROM eclipse-temurin:17-jre
 
+WORKDIR /app
+
+COPY --from=build /app/build/libs/*.jar app.jar
+
+ENTRYPOINT ["java", "-jar", "app.jar"]

backend/.DS_Store

@@ -42,7 +42,7 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-	implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '3.0.5'
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'com.google.api-client:google-api-client:1.34.0'
 	implementation 'com.google.oauth-client:google-oauth-client-jetty:1.34.0'
@@ -51,7 +51,6 @@ dependencies {
 	implementation 'com.google.auth:google-auth-library-oauth2-http:1.22.0'
 	implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-
 }
 
 tasks.named('test') {