Skip to content

08 cicd #3

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

Open
lunghyun wants to merge 6 commits into
base: 08-cicd
Choose a base branch
from
Open

08 cicd #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bfeee8
#안내문구 수정
Jun 3, 2024
30ecd08
#안내문구 수정2
Jun 3, 2024
35b04bd
#테스트로그인ID변경
Jun 3, 2024
f5a833c
#파이프라인폴더수정
Jun 3, 2024
41e8d0d
#테스트사용자이메일변경
Jun 3, 2024
0178ce5
# 도커 컴포즈 수정( 도커 허브로 전환 )
Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/leafy-postgres-build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 08-cicd
# 08-cicd 브랜치에 push될 때 워크플로우가 실행됩니다.
paths:
- 'leafy-postgres/**'
- 'leafy-postgresql/**'

jobs:
build-and-push:
Expand Down
11 changes: 6 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion leafy-frontend/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="app">
<div class="welcome-message" v-if="isLoggedIn">
<p class="welcome-text">안녕하세요, <span class="user-name">{{ user.name }}</span>님!</p>
<p class="description">오늘도 즐거운 식물 관리하세요.</p>
<p class="description">오늘도 즐거운 식물 관리^^</p>
</div>
<div class="brand" v-if="isLoggedIn">
LEAFY
Expand Down
2 changes: 1 addition & 1 deletion leafy-postgresql/init/init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down