From a4a1c96755b4d54276304494b53333a09b2dee7d Mon Sep 17 00:00:00 2001 From: mklee Date: Mon, 15 Dec 2025 05:31:08 +0000 Subject: [PATCH] update README --- README.md | 2 +- k8s/aws/20-petclinic-Deployments-postgre.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e289c4fb..a72a7dd81 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Spring PetClinic Sample Application [![Build Status](https://github.com/spring-projects/spring-petclinic/actions/workflows/maven-build.yml/badge.svg)](https://github.com/spring-projects/spring-petclinic/actions/workflows/maven-build.yml)[![Build Status](https://github.com/spring-projects/spring-petclinic/actions/workflows/gradle-build.yml/badge.svg)](https://github.com/spring-projects/spring-petclinic/actions/workflows/gradle-build.yml) -[![Build Status](https://github.com/costRider/spring-petclinic/actions/workflows/ci-petclinic.yml/badge.svg)](https://github.com/costRider/spring-petclinic/actions/workflows/ci-petclinic.yml) +[![Build Status](https://github.com/costRider/spring-petclinic/actions/workflows/ci-petclinic-eks.yaml/badge.svg)](https://github.com/costRider/spring-petclinic/actions/workflows/ci-petclinic-eks.yaml) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/spring-projects/spring-petclinic) [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=7517918) diff --git a/k8s/aws/20-petclinic-Deployments-postgre.yaml b/k8s/aws/20-petclinic-Deployments-postgre.yaml index a1de4bdc3..f7ddf9ee7 100644 --- a/k8s/aws/20-petclinic-Deployments-postgre.yaml +++ b/k8s/aws/20-petclinic-Deployments-postgre.yaml @@ -29,7 +29,15 @@ spec: containers: - name: petclinic-container +<<<<<<< HEAD image: 723926525504.dkr.ecr.ap-northeast-2.amazonaws.com/eks/petclinic:138ba75 +======= +<<<<<<< HEAD:k8s/20-petclinic-Deployments-postgre.yaml + image: 723926525504.dkr.ecr.ap-northeast-2.amazonaws.com/eks/petclinic:211b94a +======= + image: 723926525504.dkr.ecr.ap-northeast-2.amazonaws.com/eks/petclinic:e6690f6 +>>>>>>> 138ba75 ( update eks CI yaml, k8s aws):k8s/aws/20-petclinic-Deployments-postgre.yaml +>>>>>>> 71b1873 (update) # DB 설정은 ConfigMap / Secret에서 그대로 가져오기 envFrom: