-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feat/#145 #161
Merged
Feat/#145 #161
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
d2fc31f
[FEAT] CI yml ์์ฑ
1d66b71
[CHORE] Docker Compose ํ์ผ Deprecated ์ฒ๋ฆฌ
b8286e8
[FIX] ํ
์คํธ ์ฝ๋ ์ค๋ฅ ์์
mikekks a2552d9
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-baโฆ
e42bd95
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-baโฆ
9771fea
[FIX] Build ๋ช
๋ น์ด ์์
57e7fc0
[FIX] Build ๋ช
๋ น์ด ์์
85dbfd0
[FEAT] secret ๊ฐ ๋ฐ์์์ ํ์ผ ๋ง๋๋ ๋ก์ง ์ถ๊ฐ
8b33123
[CHORE] ํ์ฌ ๊ฒฝ๋ก ์ถ๋ ฅํ๋ ์ฝ๋ ์ถ๊ฐ
16fbf45
[CHORE] NestJS ์๋ฒ CI ๊ณผ์ ์์ ์ ์ธ
5e79e03
[FEAT] ์ฌ๋ฌ ๋์ปค ์ด๋ฏธ์ง๋ฅผ ๋ฐฐํฌํ๊ธฐ ์ํ ํ์ผ ์์ฑ
5ce84cd
[FEAT] CD ์คํฌ๋ฆฝํธ ์์ฑ
b3226eb
[FIX] Docker Compose ํ์ผ Deprecated ์ญ์
b849d39
[CHORE] .gitignore์ deploy.sh ์ถ๊ฐ
6d0b94c
[FEAT] Docker Compose ํ์ผ ์์
7f02a1b
[FEAT] cd.yml ์์
e5403dd
[CHORE] cd ์ด๋ฆ ์์
a01ae61
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-baโฆ
41f3ea9
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-baโฆ
c09e86d
[FEAT] dev, prod ๋ณ cd.yml ๋ถ๋ฆฌ
7144430
[CHORE] docker compose์์ env ํ์ผ ๊ฒฝ๋ก ์์
fd845ee
[CHORE] swagger.env ํ์ผ ๊ฒฝ๋ก ๋ณ๊ฒฝ
226a27c
[CHORE] .swagger.env ํ์ผ ์ฌ์ฉ ์ํ๋๋ก ์ฃผ์ ์ฒ๋ฆฌ
6912e0f
[CHORE] image ํ๊ทธ ์ถ๊ฐ
c7849a9
[CHORE] docker compose ํ์ผ ์์
8285124
[CHORE] ์ฃผ์ ์ ๊ฑฐ
87968a1
[FIX] Spring ์ด๋ฏธ์ง์ secret ๊ฐ ์ฃผ์
ํ๋๋ก ์ค์
dd48670
[FIX] application-secret.properties ํ์ผ ์์ฑํ๋๋ก ์์
bceaf46
[FEAT] Health Check ๋ฐฉ์ ์์
7be6628
[FEAT] Health Check ๋ฐฉ์ ์์
44adb7a
[FEAT] Health Check ๋ฐฉ์ ์์
f7bb9d0
[FIX] docker-compose.yml ์์
4d23c18
Merge branch 'develop' of https://github.com/sopt-makers/sopt-crew-baโฆ
e2632c7
Merge branch 'develop' into feat/#145
d41f1f4
[FIX] deploy.sh์ ๋์ปคํ๋ธ ๋น๋ฐ๋ฒํธ ํ๋์ฝ๋ฉ ์ญ์
63a54e4
[FEAT] Main, Dev ๋ฐฐํฌ ๋ฐฉ์ ๋ถ๋ฆฌ
5bc99d0
[CHORE] ๋ถํ์ํ ์ฃผ์ ์ ๊ฑฐ
ebdc677
[FEAT] PR ํ
ํ๋ฆฟ์ PR์ ์ ๊ฒ์ฌํญ ์ถ๊ฐ
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,19 @@ | ||
## ๐ฉโ๐ป Contents | ||
|
||
<!-- ์์ ๋ด์ฉ์ ์ ์ด์ฃผ์ธ์ --> | ||
|
||
## ๐ Review Note | ||
|
||
<!-- PR๊ณผ์ ์์ ๋ ์๊ฐ์ด๋ ๊ฐ์ ํ ๋ด์ฉ์ด ์๋ค๋ฉด ์ ์ด์ฃผ์ธ์. --> | ||
|
||
## ๐ฃ Related Issue | ||
|
||
<!-- ๊ด๋ จ ์ด์๋ฅผ ์ ์ด์ฃผ์ธ์. --> | ||
|
||
- closed # | ||
|
||
## โ ์ ๊ฒ์ฌํญ | ||
|
||
- [ ] docker-compose.yml ํ์ผ์ ๋ง์ด๊ทธ๋ ์ด์ ํ API์ ํฌ์๋ฉ์ ๋ณ๊ฒฝํด์คฌ๋์? | ||
- [ ] Spring Secret ๊ฐ์ ์์ ํ๊ฑฐ๋ ์ถ๊ฐํ๋ค๋ฉด Github Secret์์ ์์ ์ ํด์คฌ๋์? | ||
- [ ] Nestjs Secret ๊ฐ์ ์์ ํ๊ฑฐ๋ ์ถ๊ฐํ๋ค๋ฉด Docker-Compose.yml ํ์ผ ๋ฐ ์ธ์คํด์ค ๋ด๋ถ์ .env ํ์ผ์ ์์ ํ๋์? | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
name: Makers_Crew Dev CD | ||
on: | ||
workflow_run: | ||
workflows: [ "Makers_Crew CI" ] | ||
branches: [ "develop" ] | ||
types: [ completed ] | ||
|
||
push: | ||
branches: [ "develop" ] | ||
jobs: | ||
deploy: | ||
runs-on: ubuntu-22.04 | ||
env: | ||
working-directory-spring: main | ||
working-directory-nestjs: server | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Docker build ๊ฐ๋ฅํ๋๋ก ํ๊ฒฝ ์ค์ | ||
uses: docker/setup-buildx-action@v2 | ||
|
||
- name: Create application.properties from secret | ||
run: | | ||
echo "${{ secrets.APPLICATION_SECRET_SPRING_DEV }}" > ./main/src/main/resources/application-secret.properties | ||
shell: bash | ||
|
||
- name: Docker hub์ ๋ก๊ทธ์ธ | ||
uses: docker/login-action@v1 | ||
with: | ||
username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }} | ||
password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }} | ||
|
||
- name: docker image ๋น๋ ๋ฐ ํธ์ (Spring) | ||
run: | | ||
docker build --platform linux/amd64 -t makerscrew/main . | ||
docker push makerscrew/main | ||
working-directory: ${{ env.working-directory-spring }} | ||
|
||
- name: docker image ๋น๋ ๋ฐ ํธ์ (nestjs) | ||
run: | | ||
docker build --platform linux/amd64 -t makerscrew/server . | ||
docker push makerscrew/server | ||
working-directory: ${{ env.working-directory-nestjs }} | ||
|
||
- name: ๋์ปค ์ปจํ ์ด๋ ์คํ | ||
uses: appleboy/ssh-action@master | ||
with: | ||
host: ${{ secrets.DEV_SERVER_IP }} | ||
username: ${{ secrets.DEV_SERVER_USER }} | ||
key: ${{ secrets.DEV_SERVER_KEY }} | ||
script: | | ||
cd ~ | ||
chmod +x ./deploy.sh | ||
./deploy.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
name: Makers_Crew Main CD | ||
on: | ||
workflow_run: | ||
workflows: [ "Makers_Crew CI" ] | ||
branches: [ "main" ] | ||
types: [ completed ] | ||
|
||
push: | ||
branches: [ "main" ] | ||
jobs: | ||
deploy: | ||
runs-on: ubuntu-22.04 | ||
env: | ||
working-directory-spring: main | ||
working-directory-nestjs: server | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Docker build ๊ฐ๋ฅํ๋๋ก ํ๊ฒฝ ์ค์ | ||
uses: docker/setup-buildx-action@v2 | ||
|
||
- name: Create application.properties from secret | ||
run: | | ||
echo "${{ secrets.APPLICATION_SECRET_SPRING_PROD }}" > ./main/src/main/resources/application-secret.properties | ||
shell: bash | ||
|
||
- name: Docker hub์ ๋ก๊ทธ์ธ | ||
uses: docker/login-action@v1 | ||
with: | ||
username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }} | ||
password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }} | ||
|
||
- name: docker image ๋น๋ ๋ฐ ํธ์ (Spring) | ||
run: | | ||
docker build --platform linux/amd64 -t makerscrew/main . | ||
docker push makerscrew/main | ||
working-directory: ${{ env.working-directory-spring }} | ||
|
||
- name: docker image ๋น๋ ๋ฐ ํธ์ (nestjs) | ||
run: | | ||
docker build --platform linux/amd64 -t makerscrew/server . | ||
docker push makerscrew/server | ||
working-directory: ${{ env.working-directory-nestjs }} | ||
|
||
- name: ๋์ปค ์ปจํ ์ด๋ ์คํ | ||
uses: appleboy/ssh-action@master | ||
with: | ||
host: ${{ secrets.PROD_SERVER_IP }} | ||
username: ${{ secrets.PROD_SERVER_USER }} | ||
key: ${{ secrets.PROD_SERVER_KEY }} | ||
script: | | ||
cd ~ | ||
chmod +x ./deploy.sh | ||
./deploy.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
name: Makers_Crew CI | ||
|
||
on: | ||
push: | ||
branches: | ||
- '**' | ||
|
||
pull_request: | ||
types: [ opened, synchronize, reopened ] | ||
jobs: | ||
build-springboot: | ||
name: Build and analyze (SpringBoot) | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Set up JDK 17 | ||
uses: actions/setup-java@v3 | ||
with: | ||
java-version: 17 | ||
distribution: 'temurin' | ||
|
||
- name: Cache Gradle packages | ||
uses: actions/cache@v3 | ||
with: | ||
path: | | ||
~/.gradle/caches | ||
~/.gradle/wrapper | ||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} | ||
|
||
- name: Create application.properties from secret | ||
run: | | ||
echo "${{ secrets.APPLICATION_SECRET_SPRING_DEV }}" > ./main/src/main/resources/application-secret.properties | ||
shell: bash | ||
|
||
- name: Build and analyze (SpringBoot) | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
run: | | ||
cd main | ||
./gradlew clean build | ||
|
||
# NsetJs ์๋ฒ์ ๊ฒฝ์ฐ ๋ณ๊ฒฝ๋ ์ฌํญ์ด ์๋ค๊ณ ์๊ฐํ์ฌ CI ์์ ์๋ต / ๋ง์ฝ CI ์์ ์ด ํ์ํ๋ค๋ฉด ๋งจ ๋ฐ์ ์ฃผ์ ์ฐธ๊ณ | ||
# build-nestjs: | ||
# name: Build and analyze (NestJS) | ||
# runs-on: ubuntu-latest | ||
# steps: | ||
# - uses: actions/checkout@v3 | ||
# with: | ||
# fetch-depth: 0 | ||
|
||
# - name: Set up Node.js | ||
# uses: actions/setup-node@v3 | ||
# with: | ||
# node-version: '21' | ||
|
||
# - name: Cache npm packages | ||
# uses: actions/cache@v3 | ||
# with: | ||
# path: server/node_modules | ||
# key: ${{ runner.os }}-node-${{ hashFiles('server/package-lock.json') }} | ||
|
||
# - name: Create .dev.env from secret | ||
# run: | | ||
# echo "${{ secrets.APPLICATION_SECRET_NESTJS_DEV }}" > ./server/.dev.env | ||
# shell: bash | ||
|
||
# - name: Build and analyze (NestJS) | ||
# env: | ||
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
# run: | | ||
# cd server | ||
# npm ci | ||
# npm run start | ||
# Create .dev.env ์์ ์ ํตํด .dev.env ํ์ผ์ ์์ฑํ์์๋ CI ์์ ์ด ์คํจํจ. |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
.vscode | ||
/.idea/ | ||
/.idea/ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์คํธ ์ด๊ฑฐ ์ข๋ค์!