diff --git a/.github/workflows/leafy-postgres-build-and-push.yml b/.github/workflows/leafy-postgres-build-and-push.yml index be58bbe..5444c12 100644 --- a/.github/workflows/leafy-postgres-build-and-push.yml +++ b/.github/workflows/leafy-postgres-build-and-push.yml @@ -6,7 +6,7 @@ on: - 08-cicd # 08-cicd 브랜치에 push될 때 워크플로우가 실행됩니다. paths: - - 'leafy-postgres/**' + - 'leafy-postgresql/**' jobs: build-and-push: diff --git a/docker-compose.yml b/docker-compose.yml index 5839458..46a7bab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,9 @@ version: '3' services: leafy-postgres: - build: ./leafy-postgresql - image: leafy-postgres:5.0.0-compose + # build: ./leafy-postgresql #제거 + # image: leafy-postgres:5.0.0-compose # 도커허브계정이름/postgres 이름:tag + image: lunghyun/leafy-postgres:41e8d0d1eeb73e1b2ff2372fdc1746e8e1f6df00 volumes: - mydata:/var/lib/postgresql/data deploy: @@ -17,7 +18,7 @@ services: image: leafy-backend:5.0.0-compose environment: - DB_URL=leafy-postgres - depends_on: + depends_on: # 해당 컨테이너가 실행되기 전까지 기다림 - leafy-postgres deploy: resources: @@ -27,8 +28,8 @@ services: restart: on-failure leafy-front: - build: ./leafy-frontend - image: leafy-front:5.0.0-compose + # build: ./leafy-frontend # 제거 + image: lunghyun/leafy-frontend:30ecd086b7d000225d837f6f85680cdfe634df55 environment: - BACKEND_HOST=leafy-backend ports: diff --git a/leafy-frontend/src/App.vue b/leafy-frontend/src/App.vue index c448630..fc90a3c 100644 --- a/leafy-frontend/src/App.vue +++ b/leafy-frontend/src/App.vue @@ -2,7 +2,7 @@

안녕하세요, {{ user.name }}님!

-

오늘도 즐거운 식물 관리하세요.

+

오늘도 즐거운 식물 관리^^

LEAFY diff --git a/leafy-postgresql/init/init.sql b/leafy-postgresql/init/init.sql index 9f505f5..d6399a6 100644 --- a/leafy-postgresql/init/init.sql +++ b/leafy-postgresql/init/init.sql @@ -55,7 +55,7 @@ CREATE TABLE plant_logs ( -- $2a$10$Vqx3VUuB8gy9NvtKHQARWOOYB2wG4wV2WXy1sdQHIoY8TivSHZ3sC = password456 -- $2a$10$ke3IM6noeWfQtX6POjZHl.49gSolYbqfrSTIn8sOQubdwjP2IT94q = password789 INSERT INTO users (name, email, password, gender, birth_date) VALUES -('John', 'john123@qmail.com', '$2a$10$vYR4pPQqR/oZcUDZfXrahecEejQHY0kLkDB5s.FctPRMcEMh1PYhG', 'M', '1988-05-01'), +('lunghyun', 'ilovecloud', '$2a$10$vYR4pPQqR/oZcUDZfXrahecEejQHY0kLkDB5s.FctPRMcEMh1PYhG', 'M', '1988-05-01'), ('Jane', 'jane456@qmail.com', '$2a$10$vYR4pPQqR/oZcUDZfXrahecEejQHY0kLkDB5s.FctPRMcEMh1PYhG', 'F', '1995-08-15'), ('Peter', 'peter789@qmail.com', '$2a$10$vYR4pPQqR/oZcUDZfXrahecEejQHY0kLkDB5s.FctPRMcEMh1PYhG', 'M', '1981-12-25'), ('Susan', 'susan321@qmail.com', '$2a$10$vYR4pPQqR/oZcUDZfXrahecEejQHY0kLkDB5s.FctPRMcEMh1PYhG', 'F', '1990-06-02'),