CHORE(merge): merge branch main into develop
- Sync develop with main branch - Resolve merge conflicts
This commit is contained in:
@@ -13,7 +13,7 @@ commonLabels:
|
||||
# 이미지 태그 설정
|
||||
images:
|
||||
- name: ghcr.io/mayne0213/portfolio
|
||||
newTag: main-sha-3b311c2a0668e1fbfb4163f7fed7ecfffbc1f92c
|
||||
newTag: main-sha-70f940ed1cc86cc5cfd5748f3bd09a3bb983a678
|
||||
|
||||
patchesStrategicMerge:
|
||||
- deployment-patch.yaml
|
||||
|
||||
Reference in New Issue
Block a user