Skip to content

Commit fb10722

Browse files
dgfh0450dgfh0450
authored
[UNI-121] chore : 서비스 라우터 변경 (#54)
* [UNI-121] chore : 랜딩, 데모 라우터 변경 및 연결 변경 * [UNI-121] chore : nginx 어드민 페이지 배포 설정 수정
1 parent d169ad0 commit fb10722

File tree

3 files changed

+55
-54
lines changed

3 files changed

+55
-54
lines changed

‎.github/workflows/fe-admin-deploy.yml

+52-51
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
name: FE ADMIN CI / CD
22

33
on:
4-
push:
5-
branches:
6-
- fe
4+
push:
5+
branches:
6+
- fe
77

88
jobs:
9-
CI:
10-
runs-on: ubuntu-latest
9+
CI:
10+
runs-on: ubuntu-latest
1111

12-
env:
13-
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
14-
IMAGE_NAME: uniro-backoffice
15-
IMAGE_TAG: ${{ github.sha }}
12+
env:
13+
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
14+
IMAGE_NAME: uniro-backoffice
15+
IMAGE_TAG: ${{ github.sha }}
1616

17-
steps:
18-
- name: 코드 체크아웃
19-
uses: actions/checkout@v4
17+
steps:
18+
- name: 코드 체크아웃
19+
uses: actions/checkout@v4
2020

21-
- name: Google Cloud SDK 설정
22-
uses: "google-github-actions/auth@v2"
23-
with:
24-
credentials_json: ${{ secrets.GCP_SA_KEY }}
21+
- name: Google Cloud SDK 설정
22+
uses: "google-github-actions/auth@v2"
23+
with:
24+
credentials_json: ${{ secrets.GCP_SA_KEY }}
2525

26-
- name: Docker를 위한 gcloud 인증 설정
27-
run: gcloud auth configure-docker --quiet
26+
- name: Docker를 위한 gcloud 인증 설정
27+
run: gcloud auth configure-docker --quiet
2828

29-
- name: Create .env from secret
30-
run: |
31-
echo "${{ secrets.FE_ENV }}" > uniro_admin_frontend/.env
29+
- name: Create .env from secret
30+
run: |
31+
echo "${{ secrets.FE_ENV }}" > uniro_admin_frontend/.env
3232
33-
- name: Docker 이미지 빌드 및 푸시
34-
run: |
35-
docker build -t gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -f uniro_admin_frontend/Dockerfile .
36-
docker push gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
33+
- name: Docker 이미지 빌드 및 푸시
34+
run: |
35+
docker build -t gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -f uniro_admin_frontend/Dockerfile .
36+
docker push gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
3737
38-
CD:
39-
runs-on: ubuntu-latest
40-
needs: CI
38+
CD:
39+
runs-on: ubuntu-latest
40+
needs: CI
4141

42-
env:
43-
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
44-
IMAGE_NAME: uniro-backoffice
45-
IMAGE_TAG: ${{ github.sha }}
46-
DEPLOY_PATH: ${{ secrets.DEPLOY_SERVER_PATH }}
42+
env:
43+
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
44+
IMAGE_NAME: uniro-backoffice
45+
IMAGE_TAG: ${{ github.sha }}
46+
DEPLOY_PATH: ${{ secrets.DEPLOY_SERVER_PATH }}
4747

48-
steps:
49-
- name: 배포 서버에 SSH로 연결하여 배포
50-
uses: appleboy/[email protected]
51-
with:
52-
host: ${{ secrets.DEPLOY_SERVER_HOST }}
53-
username: ${{ secrets.DEPLOY_SERVER_USER }}
54-
key: ${{ secrets.DEPLOY_SSH_KEY }}
55-
envs: GCP_PROJECT_ID, IMAGE_NAME, IMAGE_TAG, DEPLOY_PATH, TEST
56-
script: |
57-
cd ${DEPLOY_PATH}
58-
sudo docker ps -a --format '{{.ID}} {{.Names}}' \
59-
| egrep -v 'nginx-container|uniro-fe' \
60-
| awk '{print $1}' \
61-
| xargs -r sudo docker stop || true
62-
sudo docker rm $(sudo docker ps -a -q) || true
63-
sudo docker login -u _json_key --password-stdin https://gcr.io <<< '${{ secrets.GCP_SA_KEY }}'
64-
sudo docker pull gcr.io/${GCP_PROJECT_ID}/${IMAGE_NAME}:${IMAGE_TAG}
65-
sudo docker run -d --name ${IMAGE_NAME} -p 3001:3000 gcr.io/${GCP_PROJECT_ID}/${IMAGE_NAME}:${IMAGE_TAG}
48+
steps:
49+
- name: 배포 서버에 SSH로 연결하여 배포
50+
uses: appleboy/[email protected]
51+
with:
52+
host: ${{ secrets.DEPLOY_SERVER_HOST }}
53+
username: ${{ secrets.DEPLOY_SERVER_USER }}
54+
key: ${{ secrets.DEPLOY_SSH_KEY }}
55+
envs: GCP_PROJECT_ID, IMAGE_NAME, IMAGE_TAG, DEPLOY_PATH, TEST
56+
script: |
57+
cd ${DEPLOY_PATH}
58+
sudo docker ps -a --format '{{.ID}} {{.Names}}' \
59+
| egrep -v 'nginx-container|uniro-fe' \
60+
| awk '{print $1}' \
61+
| xargs -r sudo docker stop || true
62+
sudo docker rm $(sudo docker ps -a -q) || true
63+
sudo docker login -u _json_key --password-stdin https://gcr.io <<< '${{ secrets.GCP_SA_KEY }}'
64+
sudo docker pull gcr.io/${GCP_PROJECT_ID}/${IMAGE_NAME}:${IMAGE_TAG}
65+
sudo docker run -d --name ${IMAGE_NAME} -p 3001:3000 gcr.io/${GCP_PROJECT_ID}/${IMAGE_NAME}:${IMAGE_TAG}
66+
sudo docker network connect nginx_app-network ${IMAGE_NAME}

‎uniro_frontend/src/App.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ function App() {
2626
<QueryClientProvider client={queryClient}>
2727
<Suspense key={location.key} fallback={fallback}>
2828
<Routes>
29-
<Route path="/" element={<Demo />} />
30-
<Route path="/landing" element={<LandingPage />} />
29+
<Route path="/demo" element={<Demo />} />
30+
<Route path="/" element={<LandingPage />} />
3131
<Route path="/university" element={<UniversitySearchPage />} />
3232
<Route path="/building" element={<BuildingSearchPage />} />
3333
<Route path="/map" element={<MapPage />} />

‎uniro_frontend/src/hooks/useRedirectUndefined.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect } from "react";
22
import { useNavigate } from "react-router";
33

4-
export default function useRedirectUndefined<T>(deps: T[], url: string = "/landing") {
4+
export default function useRedirectUndefined<T>(deps: T[], url: string = "/") {
55
const navigate = useNavigate();
66

77
useEffect(() => {

0 commit comments

Comments
 (0)