From 863ff0e339a4386371ccdb56aa0fb99c0965406d Mon Sep 17 00:00:00 2001 From: Min-SungJo <123or@naver.com> Date: Mon, 15 Jul 2024 02:34:23 +0900 Subject: [PATCH 1/5] =?UTF-8?q?#51=20-=20prod-env=20localhost=EB=A5=BC=20V?= =?UTF-8?q?ITE=5FDOMAIN=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 1 + frontend/src/components/map/AgriMap.jsx | 4 ++-- frontend/src/components/map/CoordMap.jsx | 4 ++-- frontend/src/pathData.js | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5d33648..eb992bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,7 @@ services: VITE_BACKEND_URL: ${VITE_BACKEND_URL} VITE_GEOSERVER_URL: ${VITE_GEOSERVER_URL} VITE_PGADMIN_URL: ${VITE_PGADMIN_URL} + VITE_DOMAIN: ${VITE_DOMAIN} volumes: - ssl:/etc/letsencrypt/live/${DOMAIN} networks: diff --git a/frontend/src/components/map/AgriMap.jsx b/frontend/src/components/map/AgriMap.jsx index 13fd331..566feba 100644 --- a/frontend/src/components/map/AgriMap.jsx +++ b/frontend/src/components/map/AgriMap.jsx @@ -35,7 +35,7 @@ const AgriMap = () => { const getAgriData = async (distance) => { try { showLoading(); - const url = `http://localhost:8080/api/v1/search/office?query=s&x=${x}&y=${y}&distance=${distance}`; + const url = `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/office?query=s&x=${x}&y=${y}&distance=${distance}`; const response = await fetch(url); if (!response.ok) { throw new Error(`HTTP error! status: ${response.status}`); @@ -68,7 +68,7 @@ const AgriMap = () => { const vworldLayer = new TileLayer({ source: new XYZ({ - url: `http://localhost:8080/api/v1/search/wmts/Base/{z}/{y}/{x}.png`, + url: `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/wmts/Base/{z}/{y}/{x}.png`, }), }); diff --git a/frontend/src/components/map/CoordMap.jsx b/frontend/src/components/map/CoordMap.jsx index 25d3bb2..4288215 100644 --- a/frontend/src/components/map/CoordMap.jsx +++ b/frontend/src/components/map/CoordMap.jsx @@ -40,7 +40,7 @@ const CoordMap = () => { type: 'base', visible: false, source: new XYZ({ - url : `http://localhost:8080/api/v1/search/wmts/Base/{z}/{y}/{x}.png`, + url : `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/wmts/Base/{z}/{y}/{x}.png`, }) }) @@ -50,7 +50,7 @@ const CoordMap = () => { type: 'base', visible: false, source: new XYZ({ - url : `http://localhost:8080/api/v1/search/wmts/Satellite/{z}/{y}/{x}.jpeg`, + url : `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/wmts/Satellite/{z}/{y}/{x}.jpeg`, }) }) diff --git a/frontend/src/pathData.js b/frontend/src/pathData.js index 7c235a7..7439237 100644 --- a/frontend/src/pathData.js +++ b/frontend/src/pathData.js @@ -8,7 +8,7 @@ export const pathData = { description: '좌표 변환기', searchException: '검색 결과가 없습니다.', api: { - input: 'http://localhost:8080/api/v1/search/api-point-with-page', + input: `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/api-point-with-page`, } }, 'agricultural' : { @@ -16,7 +16,7 @@ export const pathData = { description: '농기계 임대 검색', searchException: '해당 주소에 농기계가 없습니다.', api: { - input: 'http://localhost:8080/api/v1/search/office-address', + input: `https://${import.meta.env.VITE_DOMAIN}/api/v1/search/office-address`, } }, - } \ No newline at end of file +} \ No newline at end of file From 22eb29c42e484db62cd974f2bcf97399b8dca80c Mon Sep 17 00:00:00 2001 From: Min-SungJo <123or@naver.com> Date: Mon, 15 Jul 2024 02:58:48 +0900 Subject: [PATCH 2/5] =?UTF-8?q?#51=20-=20.env=20=ED=8C=8C=EC=9D=BC=20front?= =?UTF-8?q?end=20=EB=A1=9C=20=EB=B3=B5=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 ++- frontend/Dockerfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1b431df..ca7d438 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -98,7 +98,8 @@ jobs: echo "REPO_NAME=${{ secrets.REPO_NAME }}" >> .env echo "VERSION=$VERSION" >> .env echo "DOMAIN=${{ secrets.DOMAIN }}" >> .env - + echo "VITE_DOMAIN=${{ secrets.DOMAIN }}" >> .env + - name: Copy files via SSH run: | scp -P ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no docker-compose.yml .env ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:/home/${{ secrets.SSH_USERNAME }}/ diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c99eebd..97249f9 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -5,6 +5,7 @@ FROM node:20-alpine AS build WORKDIR /app # package.json과 package-lock.json 복사 +COPY ../.env .env COPY package*.json ./ # 의존성 설치 From f783b0d155db9f1fc64c648d00860e09ce494a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AF=BC=EC=84=B1=EC=A1=B0?= <91239439+Min-SungJo@users.noreply.github.com> Date: Mon, 15 Jul 2024 03:07:33 +0900 Subject: [PATCH 3/5] =?UTF-8?q?#51=20-=20frontend=20=EB=82=B4=EB=B6=80?= =?UTF-8?q?=EC=97=90=20.env=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 97249f9..2b744da 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,8 +4,11 @@ FROM node:20-alpine AS build # 작업 디렉토리 설정 WORKDIR /app +# .env 파일 생성 +ARG DOMAIN +RUN echo "VITE_DOMAIN=${DOMAIN}" > .env + # package.json과 package-lock.json 복사 -COPY ../.env .env COPY package*.json ./ # 의존성 설치 From b328fdd2739a4d262646683dc87b04923c7476b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AF=BC=EC=84=B1=EC=A1=B0?= <91239439+Min-SungJo@users.noreply.github.com> Date: Mon, 15 Jul 2024 04:23:50 +0900 Subject: [PATCH 4/5] =?UTF-8?q?#51=20TZ=20=EC=84=9C=EC=9A=B8=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index eb992bc..cb38ea4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} PGDATA: /var/lib/postgresql/data + TZ: Asia/Seoul volumes: - postgres_data:/var/lib/postgresql/data - ./sql:/docker-entrypoint-initdb.d @@ -25,6 +26,7 @@ services: environment: PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL} PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD} + TZ: Asia/Seoul volumes: - pgadmin:/var/lib/pgadmin networks: @@ -73,6 +75,7 @@ services: VITE_GEOSERVER_URL: ${VITE_GEOSERVER_URL} VITE_PGADMIN_URL: ${VITE_PGADMIN_URL} VITE_DOMAIN: ${VITE_DOMAIN} + TZ: Asia/Seoul volumes: - ssl:/etc/letsencrypt/live/${DOMAIN} networks: From 11a5e00767fb0a7af0caed7dee336bf1a29b4f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AF=BC=EC=84=B1=EC=A1=B0?= <91239439+Min-SungJo@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:33:08 +0900 Subject: [PATCH 5/5] =?UTF-8?q?#51=20-=20=EA=B8=B0=EC=A1=B4=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20ssl=EC=82=AD=EC=A0=9C=EB=A5=BC=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20certbot=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=84=A4?= =?UTF-8?q?=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 2b744da..6d63688 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -26,6 +26,9 @@ FROM nginx:alpine # 환경 변수 설정 ARG DOMAIN +# Certbot 설치 +RUN apk add --no-cache certbot certbot-nginx openssl + COPY ./ssl/ /etc/letsencrypt/live/${DOMAIN}/ # SSL 인증서 파일 확인 RUN ls -l /etc/letsencrypt/live/${DOMAIN}