From 1bfeee80db914cc104a947c86b06e5c7c7cf3f71 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 3 Jun 2024 05:38:18 +0000 Subject: [PATCH 1/6] =?UTF-8?q?#=EC=95=88=EB=82=B4=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- leafy-frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leafy-frontend/src/App.vue b/leafy-frontend/src/App.vue index c448630..7f66238 100644 --- a/leafy-frontend/src/App.vue +++ b/leafy-frontend/src/App.vue @@ -2,7 +2,7 @@

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

-

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

+

어제도 즐거운 식물 관리하세요.

LEAFY From 30ecd086b7d000225d837f6f85680cdfe634df55 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 3 Jun 2024 05:45:12 +0000 Subject: [PATCH 2/6] =?UTF-8?q?#=EC=95=88=EB=82=B4=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- leafy-frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leafy-frontend/src/App.vue b/leafy-frontend/src/App.vue index 7f66238..fc90a3c 100644 --- a/leafy-frontend/src/App.vue +++ b/leafy-frontend/src/App.vue @@ -2,7 +2,7 @@

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

-

어제도 즐거운 식물 관리하세요.

+

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

LEAFY From 35b04bd9db95db79164a6702034c31e684f5c87a Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 3 Jun 2024 06:05:01 +0000 Subject: [PATCH 3/6] =?UTF-8?q?#=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8ID=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- leafy-postgresql/init/init.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leafy-postgresql/init/init.sql b/leafy-postgresql/init/init.sql index 9f505f5..2df78fb 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', 'mrpn604@kumoh.ac.kr', '$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'), From f5a833c5234300cd9e81e955827cd10932152d4c Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 3 Jun 2024 06:06:35 +0000 Subject: [PATCH 4/6] =?UTF-8?q?#=ED=8C=8C=EC=9D=B4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=ED=8F=B4=EB=8D=94=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/leafy-postgres-build-and-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From 41e8d0d1eeb73e1b2ff2372fdc1746e8e1f6df00 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 3 Jun 2024 06:08:38 +0000 Subject: [PATCH 5/6] =?UTF-8?q?#=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=B4=EB=A9=94=EC=9D=BC=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- leafy-postgresql/init/init.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leafy-postgresql/init/init.sql b/leafy-postgresql/init/init.sql index 2df78fb..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 -('lunghyun', 'mrpn604@kumoh.ac.kr', '$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'), From 0178ce5d8fbae8e7b006b1520e497fb52f71bd64 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 19 Jun 2024 12:54:31 +0000 Subject: [PATCH 6/6] =?UTF-8?q?#=20=EB=8F=84=EC=BB=A4=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EC=A6=88=20=EC=88=98=EC=A0=95(=20=EB=8F=84=EC=BB=A4=20?= =?UTF-8?q?=ED=97=88=EB=B8=8C=EB=A1=9C=20=EC=A0=84=ED=99=98=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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: