Skip to content
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

Jump to bottom

🐞 BugFix : dev μ„œλ²„ 볡ꡬ #121

Merged
merged 110 commits into from
Dec 28, 2024
Merged

🐞 BugFix : dev μ„œλ²„ 볡ꡬ #121

merged 110 commits into from
Dec 28, 2024

Conversation

yoonseopkim
Copy link
Contributor

#οΈβƒ£μ—°κ΄€λœ 이슈

ex) #이슈번호, #이슈번호

πŸ“μž‘μ—… λ‚΄μš©

이번 PRμ—μ„œ μž‘μ—…ν•œ λ‚΄μš©μ„ κ°„λž΅νžˆ μ„€λͺ…ν•΄μ£Όμ„Έμš”(이미지 첨뢀 κ°€λŠ₯)

  • prod λ₯Ό λ„μš°λ©΄μ„œ μ•ˆλλ˜ dev μ„œλ²„λ₯Ό λ³΅κ΅¬ν–ˆμŠ΅λ‹ˆλ‹€.
  • prod μž‘μ—…μ€ main λΈŒλžœμΉ˜μ—μ„œ 진행 및 배포할 μ˜ˆμ •μž…λ‹ˆλ‹€.
  • λͺ½κ³  ν΄λŸ¬μŠ€ν„°λ§ μ§„ν–‰ν–ˆμŠ΅λ‹ˆλ‹€.

μŠ€ν¬λ¦°μƒ· (선택)

πŸ’¬λ¦¬λ·° μš”κ΅¬μ‚¬ν•­(선택)

리뷰어가 νŠΉλ³„νžˆ λ΄μ£Όμ—ˆμœΌλ©΄ ν•˜λŠ” 뢀뢄이 μžˆλ‹€λ©΄ μž‘μ„±ν•΄μ£Όμ„Έμš”

ex) λ©”μ„œλ“œ XXX의 이름을 더 잘 짓고 싢은데 ν˜Ήμ‹œ 쒋은 λͺ…칭이 μžˆμ„κΉŒμš”?

슀쿼 μ‹œ μ•€ 머지 λΆ€νƒλ“œλ¦½λ‹ˆλ‹€.(컀밋 109개)

@yoonseopkim
fix:backcicd.yaml 도컀 μ»¨ν…Œμ΄λ„ˆλ₯Ό 내리고 λ‹€μ‹œ μ˜¬λ¦¬λ„λ‘ 변경함
55a3017
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
35c71cc 
…CI/CD-κ΅¬ν˜„
@yoonseopkim
fix:backcicd.yaml 도컀 컴포즈 yml μ—μ„œ yaml μˆ˜μ •
2938a9e
@yoonseopkim
fix:backcicd.yaml 도컀 컴포즈 yml μ—μ„œ yaml μˆ˜μ •
204039e
@yoonseopkim
fix:backcicd.yaml μ£Όμ„μ˜€λ₯˜ μˆ˜μ •
5c5c588
@yoonseopkim
fix:backcicd.yaml μ£Όμ„μ˜€λ₯˜ μˆ˜μ •2
be41d46
@yoonseopkim
fix:backcicd.yaml dev1 νƒœκ·Έμ—μ„œ test 둜 λ³€κ²½
b9f02b5
@yoonseopkim
fix:backcicd.yaml μ½”λ“œ λ¦¬νŒ©ν† λ§
ec56dd6
@yoonseopkim
fix:backcicd.yaml μ•„ν‚€ν…μ²˜ ꡬ쑰에 맞게 ν• λ‹Ή μΈμŠ€ν„΄μŠ€ λ³€κ²½
e6b92f8
@yoonseopkim
fix:backcicd.yaml 적용 브랜치 λ³€κ²½
54bbc19
@yoonseopkim
fix:backcicd.yaml ν™˜κ²½λ³€μˆ˜ μˆ˜μ •
8252402
@yoonseopkim
fix:backcicd.yaml ν™˜κ²½λ³€μˆ˜ μˆ˜μ •2
b1f7032
@yoonseopkim
fix:backcicd.yaml ν™˜κ²½λ³€μˆ˜ μˆ˜μ •3
78d5e3d
@yoonseopkim
fix:backcicd.yaml 각 λͺ¨λ“ˆλ³„ jobs 둜 뢄리
fdc810c
@yoonseopkim
fix:backcicd.yaml 멀버λͺ¨λ“ˆ ν…ŒμŠ€νŠΈ
0f0d496
@yoonseopkim
fix:backcicd.yaml 및 각 λ„μ»€νŒŒμΌμ— ν™˜κ²½λ³€μˆ˜ λ„£μ–΄μ„œ μ‹€ν–‰ ν…ŒμŠ€νŠΈ
6878ce7
@yoonseopkim
fix:backcicd.yaml 전체λͺ¨λ“ˆ μ‹€ν–‰ ν…ŒμŠ€νŠΈ
7e19ca9
@yoonseopkim
fix:backcicd.yaml 전체λͺ¨λ“ˆ μ‹€ν–‰ ν…ŒμŠ€νŠΈ λ„μ»€νŒŒμΌ λŒ€λ¬Έμžλ‘œ λ³€κ²½
ce5bf27
@yoonseopkim
fix:backcicd.yaml json νŒŒμ‹±μœΌλ‘œ λ³€κ²½
a20343e
@yoonseopkim
fix:backcicd.yaml json νŒŒμ‹±μœΌλ‘œ λ³€κ²½2
ffc1b80
@yoonseopkim
fix:backcicd.yaml json νŒŒμ‹±μœΌλ‘œ λ³€κ²½3
d6f94a1
@yoonseopkim
fix:backcicd.yaml json νŒŒμ‹±μœΌλ‘œ λ³€κ²½4
8ff49ea
@yoonseopkim
fix:backcicd.yaml json νŒŒμ‹±μœΌλ‘œ λ³€κ²½5
901f9bf
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
d37623e 
…CI/CD-κ΅¬ν˜„
@yoonseopkim
fix:backcicd.yaml 파일λͺ… μˆ˜μ •
5e85129
@yoonseopkim
fix:backcicd.yaml λ„μ»€νŒŒμΌ 경둜 μˆ˜μ •
139f677
@yoonseopkim
fix:backcicd.yaml λ„μ»€νŒŒμΌ 경둜 μˆ˜μ •2
78743e2
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
e5ce350 
…CI/CD-κ΅¬ν˜„
@yoonseopkim
fix:backcicd.yaml ec2에 .env μ£Όμž…
d81a074
@yoonseopkim
fix:backcicd.yaml ν™˜κ²½λ³€μˆ˜ μˆ˜μ •, 앱단 ν™˜κ²½λ³€μˆ˜ 였λ₯˜ μˆ˜μ •
45d6b63
yoonseopkim and others added 24 commits December 17, 2024 15:51
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
ff969a1 
…CI/CD-κ΅¬ν˜„

# Conflicts:
#	dockerfile
@yoonseopkim
fix: μ  ν‚¨μŠ€ λΉŒλ” ν‘Έμ‹œ μ•ˆν•˜κ²Œ 함.
8962254
@yoonseopkim
fix: μ  ν‚¨μŠ€ 이미지 μ •λ¦¬ν•˜κ²Œ 함.
848ecdd
@yoonseopkim
fix: ecr μ΄λ―Έμ§€λ‘œ λ³€κ²½ ν…ŒμŠ€νŠΈ
1d90d34
@yoonseopkim
fix: 각 λͺ¨λ“ˆ λ„μ»€νŒŒμΌ ecr 경둜둜 λ³€κ²½
27287bc 
tag:test->dev λ³€κ²½
delete: chat λͺ¨λ“ˆ λ„μ»€νŒŒμΌ
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
e7458e7 
…CI/CD-κ΅¬ν˜„
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λΉŒλ” 이미지 μ°Έμ‘° 방식 μˆ˜μ •
b17e21e
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λΉŒλ” 이미지 μ°Έμ‘° 방식 μˆ˜μ • 2
f5897ef
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λΉŒλ” 이미지 μ°Έμ‘° 방식 μˆ˜μ • 3
b429435
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λΉŒλ” 이미지 μ°Έμ‘° 방식 μˆ˜μ • 4
427ae7e
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λΉŒλ” 이미지 μ°Έμ‘° 방식 μˆ˜μ • 5
3c20d0c
@yoonseopkim
fix: λ„μ»€νŒŒμΌ 디버깅 μΆ”κ°€
4a63dda
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λŸ°νƒ€μž„λ•Œ ν™˜κ²½λ³€μˆ˜ μ•ˆ 읽도둝 λ³€κ²½
ef500a9
@yoonseopkim
fix: λ„μ»€νŒŒμΌ λŸ°νƒ€μž„λ•Œ ν™˜κ²½λ³€μˆ˜ μ•ˆ 읽도둝 λ³€κ²½ 2
f2046e9
@ghk01214
Merge branch 'develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-CI/CD-κ΅¬ν˜„
9d860d4
@yoonseopkim
fix: develop λΈŒλžœμΉ˜μ— μ μš©λ˜λ„λ‘ 함
7cd6ce0
@yoonseopkim
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
dcec627 
…CI/CD-κ΅¬ν˜„
@yoonseopkim
fix: dev 용 μ  ν‚¨μŠ€
394b467
@ghk01214
Merge remote-tracking branch 'origin/develop' into 48-Develop브랜치-ν‘Έμ‹œμ‹œ-…
92661ce 
…CI/CD-κ΅¬ν˜„
@ghk01214
λΉŒλ” λΉŒλ“œ μ „ ν™˜κ²½λ³€μˆ˜ 확인
5014afd
@yoonseopkim
Merge remote-tracking branch 'origin/48-Develop브랜치-ν‘Έμ‹œμ‹œ-CI/CD-κ΅¬ν˜„' into…
4bfd944 
… 48-Develop브랜치-ν‘Έμ‹œμ‹œ-CI/CD-κ΅¬ν˜„
@yoonseopkim
fix: μ • 상 ν™” ! !! !
5f2c6a2
@yoonseopkim
fix: dev νƒœκ·Έ λ„£μŒ
f25ea53
@yoonseopkim
fix: μ–΄μ΄μ—†λŠ” μ‹€μˆ˜
3e8dfc1
@yoonseopkim yoonseopkim added the 🐞 BugFix 버그 μˆ˜μ • label Dec 24, 2024
@yoonseopkim yoonseopkim self-assigned this Dec 24, 2024
namkikim0718
namkikim0718 approved these changes Dec 28, 2024
View reviewed changes
Copy link
Member

@namkikim0718 namkikim0718 left a comment

Choose a reason for hiding this comment

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

κ³ μƒν•˜μ…¨μŠ΅λ‹ˆλ‹€!

@namkikim0718 namkikim0718 merged commit 6767f12 into develop Dec 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@namkikim0718 namkikim0718 namkikim0718 approved these changes

Assignees

@yoonseopkim yoonseopkim

Labels
🐞 BugFix 버그 μˆ˜μ •
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yoonseopkim @namkikim0718 @ghk01214