Skip to content

chore/KD-58: AWS 개발 서버 CD를 위한 workflow 추가 #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JangYeongHu merged 16 commits into from
Dec 31, 2025
Merged

chore/KD-58: AWS 개발 서버 CD를 위한 workflow 추가 #307

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ed4b33a
chore: AWS 개발 서버 CD를 위한 worlflow 추가
JangYeongHu Dec 29, 2025
33908eb
fix: docker compose에서 SSH_PRIVATE_KEY를 제거
Dec 29, 2025
ff6883b
refactor: 버전 업데이트
Dec 29, 2025
5a59393
refactor: 워크플로우 감지를 위해 이벤트 트리거에 임시적인 현재 브랜치 추가
Dec 29, 2025
5ccfbca
fix: environment 수정
Dec 29, 2025
e303d0c
fix: 체크포인트 추가
Dec 29, 2025
d75ec18
fix: CORS 개발 서버 IP 추가
Dec 30, 2025
66a545f
fix: CORS 오류 해결
Dec 30, 2025
ba707c1
refactor: 기존 개발 서버 관련 workflow, cors 설정 제거
Dec 31, 2025
cc2823c
refactor: Caddy를 사용한 리버스 프록시 구성
Dec 31, 2025
d200a48
refactor: on push 이벤트 임시 제거
Dec 31, 2025
4d86df2
refactor: 현재 브랜치 추가
Dec 31, 2025
1ea42eb
Merge remote-tracking branch 'origin/chore/KD-58' into chore/KD-58
Dec 31, 2025
23e13b0
refactor: 현재 브랜치 제거
Dec 31, 2025
00ed796
refactor: ocker -> docker 오타 수정
Dec 31, 2025
3b3defb
refactor: SecurityConfig 오타 수정
Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions .github/workflows/dev-build-deploy.yml → .github/workflows/cloud-dev-build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Deploy to Development Server
name: Build and Deploy to Development Server on Cloud

on:
push:
Expand All @@ -9,11 +9,11 @@ on:
jobs:
build-docker-image:
runs-on: ubuntu-latest
environment: dev
environment: cloud-dev

steps:
- name: get repo from github
uses: actions/checkout@v3
uses: actions/checkout@v4

# JDK setting
- name: Set up JDK 17
Expand All @@ -34,7 +34,7 @@ jobs:

# DockerHub 로그인
- name: Docker login
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
deploy-to-dev:
runs-on: ubuntu-latest
needs: build-docker-image
environment: dev
environment: cloud-dev

steps:
- name: checkout repository
Expand All @@ -85,7 +85,7 @@ jobs:
with:
host: ${{ secrets.SERVER_HOST }}
username: ${{ secrets.SERVER_USERNAME }}
password: ${{ secrets.SERVER_PASSWORD }}
key: ${{ secrets.SSH_PRIVATE_KEY }}
port: ${{ secrets.SERVER_PORT }}
source: docker/development/docker-compose.yml
target: ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}
Expand All @@ -96,13 +96,11 @@ jobs:
with:
host: ${{ secrets.SERVER_HOST }}
username: ${{ secrets.SERVER_USERNAME }}
password: ${{ secrets.SERVER_PASSWORD }}
key: ${{ secrets.SSH_PRIVATE_KEY }}
port: ${{ secrets.SERVER_PORT }}
script: |
echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-api
echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-admin
echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-auth
set -euo pipefail
Copy link
Copy Markdown
Member

@LeeHanEum LeeHanEum Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거는 처음 알았네요 👍

cd ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}

echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-api
echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-admin
echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-auth
docker compose pull aics-api aics-admin aics-auth
docker compose --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-api aics-admin aics-auth
21 changes: 10 additions & 11 deletions aics-admin/src/main/java/kgu/developers/admin/config/SwaggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package kgu.developers.admin.config;

import static java.lang.String.format;

import java.util.List;
import java.util.Map;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.servers.Server;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import java.util.List;
import java.util.Map;

import static java.lang.String.format;

@Configuration
@RequiredArgsConstructor
Expand All @@ -34,7 +33,7 @@ public class SwaggerConfig {
private final Environment environment;

private static final Map<String, String> PROFILE_SERVER_URL_MAP = Map.of(
"dev", "https://aics-admin.ummdev.com",
"dev", "http://52.79.164.36:8081",
Copy link
Copy Markdown
Member

@LeeHanEum LeeHanEum Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

음 public ip가 외부로 드러나는게 좋은 상황은 아닌거 같아요.
환경변수 처리하거나 dns로 대체하는게 어떨까요?

"local", "http://localhost:8081"
);

Expand Down
21 changes: 10 additions & 11 deletions aics-api/src/main/java/kgu/developers/api/config/SwaggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package kgu.developers.api.config;

import static java.lang.String.format;

import java.util.List;
import java.util.Map;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.servers.Server;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import java.util.List;
import java.util.Map;

import static java.lang.String.format;

@Configuration
@RequiredArgsConstructor
Expand All @@ -34,7 +33,7 @@ public class SwaggerConfig {
private final Environment environment;

private static final Map<String, String> PROFILE_SERVER_URL_MAP = Map.of(
"dev", "https://aics-api.ummdev.com",
"dev", "http://52.79.164.36:8080",
"local", "http://localhost:8080"
);

Expand Down
21 changes: 10 additions & 11 deletions aics-auth/src/main/java/kgu/developers/auth/config/SwaggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package kgu.developers.auth.config;

import static java.lang.String.format;

import java.util.List;
import java.util.Map;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.servers.Server;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import java.util.List;
import java.util.Map;

import static java.lang.String.format;

@Configuration
@RequiredArgsConstructor
Expand All @@ -34,7 +33,7 @@ public class SwaggerConfig {
private final Environment environment;

private static final Map<String, String> PROFILE_SERVER_URL_MAP = Map.of(
"dev", "https://aics-auth.ummdev.com",
"dev", "http://52.79.164.36:8082",
"local", "http://localhost:8082"
);

Expand Down
17 changes: 8 additions & 9 deletions aics-common/src/main/java/kgu/developers/common/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kgu.developers.common.config;

import java.util.Arrays;
import java.util.Collections;

import kgu.developers.common.auth.filter.TokenAuthenticationFilter;
import kgu.developers.common.auth.jwt.TokenProvider;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
Expand All @@ -19,9 +19,8 @@
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;

import kgu.developers.common.auth.filter.TokenAuthenticationFilter;
import kgu.developers.common.auth.jwt.TokenProvider;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
import java.util.Collections;

@Configuration
@EnableWebSecurity
Expand Down Expand Up @@ -99,9 +98,9 @@ CorsConfigurationSource corsConfigurationSource() {
"http://localhost:8080",
"http://localhost:8081",
"http://localhost:8082",
"https://aics-api.ummdev.com",
"https://aics-admin.ummdev.com",
"https://aics-auth.ummdev.com",
"http://52.79.164.36:8080",
"http://52.79.164.36:8081",
"http://52.79.164.36:8082",
Copy link
Copy Markdown
Member

@LeeHanEum LeeHanEum Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cors address도 사실 외부에서 주입 받으면 좋을듯요

  1. 보안 이슈
  2. 하드 코딩 의존성

보통 이 두가지 때문에 yaml로 빼거나 환경변수로 분리하는 것 같아요

"https://aics-client-dev.vercel.app/",
"http://175.45.195.63",
"http://203.249.22.207",
Expand Down