Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
826fc9b
Merge pull request #9 from Leets-Official/develop
user040131 Jan 23, 2026
49d4bdb
Prepare Gradle Wrapper in cicd.yml
user040131 Jan 23, 2026
defaddb
Merge pull request #10 from Leets-Official/user040131-patch-1
user040131 Jan 23, 2026
70e0d3f
Merge pull request #11 from Leets-Official/feature/#6-docker-파일-생성
user040131 Jan 23, 2026
4b245c7
Update test command in CI workflow
user040131 Jan 23, 2026
d373f5c
Merge pull request #12 from Leets-Official/user040131-patch-2
user040131 Jan 23, 2026
670c3dd
Update cicd.yml
user040131 Jan 23, 2026
fe7169c
Merge pull request #13 from Leets-Official/user040131-patch-3
user040131 Jan 23, 2026
b1a6dde
Update JWT_SECRET for CI environment
user040131 Jan 23, 2026
f0a586a
Merge pull request #14 from Leets-Official/user040131-patch-4
user040131 Jan 23, 2026
be08dca
Set image name to lowercase in cicd.yml
user040131 Jan 23, 2026
5fbe75c
Merge pull request #15 from Leets-Official/user040131-patch-5
user040131 Jan 23, 2026
7919431
Change app port mapping from 8080 to 80
user040131 Jan 24, 2026
e8c01c0
Merge pull request #17 from Leets-Official/user040131-patch-7
user040131 Jan 24, 2026
fd0e503
Merge pull request #19 from Leets-Official/feature/#6-docker-파일-생성
user040131 Jan 24, 2026
394c574
Update cicd.yml
user040131 Jan 24, 2026
b6029e7
Merge pull request #20 from Leets-Official/user040131-patch-8
user040131 Jan 24, 2026
f070452
Update cicd.yml
user040131 Jan 24, 2026
9fc7b7c
Merge pull request #21 from Leets-Official/user040131-patch-9
user040131 Jan 24, 2026
9f7edb3
Update compose.yaml
user040131 Jan 24, 2026
9da7cb6
Merge pull request #22 from Leets-Official/user040131-patch-10
user040131 Jan 24, 2026
817eb50
Merge pull request #27 from Leets-Official/develop
user040131 Jan 29, 2026
2ab4f6b
Update deployment source files in cicd.yml
user040131 Jan 31, 2026
f8b3638
Merge pull request #29 from Leets-Official/user040131-patch-1
user040131 Jan 31, 2026
a6ac553
Update Docker Compose configuration for app and add Caddy
user040131 Jan 31, 2026
840e28c
Merge pull request #33 from Leets-Official/user040131-patch-2
user040131 Jan 31, 2026
2b89a35
Merge pull request #32 from Leets-Official/develop
user040131 Jan 31, 2026
4df4849
Update compose.yaml
user040131 Jan 31, 2026
d2c11f5
Merge pull request #34 from Leets-Official/user040131-patch-3
user040131 Jan 31, 2026
d1657b4
Merge pull request #42 from Leets-Official/develop
user040131 Feb 10, 2026
7ba0032
Merge pull request #44 from Leets-Official/develop
HYUNJOON-SUNG Feb 11, 2026
b612109
fix: JacksonConfix 파일 에러 해결
HYUNJOON-SUNG Feb 11, 2026
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
58 changes: 50 additions & 8 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,43 @@ jobs:
distribution: "temurin"
java-version: "17"

- name: Prepare Gradle Wrapper
run: |
sed -i 's/\r$//' ./gradlew
chmod +x ./gradlew
# 테스트에서 스프링 컨텍스트가 JWT_SECRET 요구하면 터질 수 있으니 더미 주입
- name: Test
run: ./gradlew test
run: ./gradlew test --no-daemon --stacktrace
env:
JWT_SECRET: "dummy-for-ci"
SPRING_PROFILES_ACTIVE: test

# 이미 넣었던 것
JWT_SECRET: "THIS_IS_A_32+_CHAR_SECRET_FOR_CI_ONLY_1234567890"

# ✅ application.yaml이 요구하는 Kakao env 더미 (CI에선 실제로 안 써도 됨)
KAKAO_CLIENT_ID: "dummy"
KAKAO_CLIENT_SECRET: "dummy"
KAKAO_REDIRECT_URI: "http://localhost/dummy"
KAKAO_ADMIN_KEY: "dummy"

# ✅ 혹시 코드/설정이 요구하면 같이 더미로
DB_USERNAME: "dummy"
DB_PASSWORD: "dummy"




build_and_push:
needs: [ci]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set image name (lowercase)
run: |
OWNER_LC=$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')
echo "IMAGE_NAME=ghcr.io/${OWNER_LC}/monifit-be" >> $GITHUB_ENV

- name: Login to GHCR
uses: docker/login-action@v3
with:
Expand All @@ -54,6 +79,18 @@ jobs:
needs: [build_and_push]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Upload compose.yaml to EC2
uses: appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "compose.yaml,Caddyfile"
target: "/srv/app"

- name: Deploy on EC2 (pull & restart)
uses: appleboy/ssh-action@v1.2.0
with:
Expand All @@ -64,11 +101,16 @@ jobs:
script: |
set -e
cd /srv/app

echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u "${{ secrets.GHCR_USERNAME }}" --password-stdin


# ✅ OWNER를 lowercase로 강제
OWNER_LC=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
export OWNER_LC

# ✅ 이미지 태그 주입 (compose.yaml에서 사용)
export IMAGE_TAG=${{ github.sha }}

docker compose pull
docker compose up -d --remove-orphans

echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u "${{ secrets.GHCR_USERNAME }}" --password-stdin

docker compose -f compose.yaml pull
docker compose -f compose.yaml up -d --remove-orphans --force-recreate
docker image prune -f
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# https://github.com/docker/awesome-compose
services:
app:
image: ghcr.io/${OWNER_LC}/monifit-be:${IMAGE_TAG:-latest}
image: ghcr.io/leets-official/monifit-be:${IMAGE_TAG:-latest}
restart: always
expose:
- "8080"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;

/**
* Jackson ObjectMapper 전역 설정
Expand All @@ -15,8 +16,9 @@ public class JacksonConfig {

@Bean
@Primary
public ObjectMapper objectMapper() {
ObjectMapper mapper = new ObjectMapper();
public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) {
// Spring Boot의 기본 설정(JavaTimeModule 등)을 유지하면서 ObjectMapper 생성
ObjectMapper mapper = builder.build();

// Enum 값을 대소문자 구분 없이 받아들임
// 예: "food" -> FOOD, "Food" -> FOOD 모두 허용
Expand Down