From e347cec1b07343349c8ae2676ad295cdfe5aa5b2 Mon Sep 17 00:00:00 2001 From: eternrust Date: Wed, 13 Mar 2024 17:18:39 +0900 Subject: [PATCH] ADD :: docker env --- .github/workflows/deploy-admin.yml | 7 +++++++ .github/workflows/deploy-main.yml | 7 +++++++ .github/workflows/deploy-user.yml | 7 +++++++ service/admin/Dockerfile | 18 ++++++++++++++++++ service/admin/src/apis/axios.ts | 2 +- service/main/Dockerfile | 18 ++++++++++++++++++ service/main/next.config.js | 8 -------- service/main/src/apis/axios.ts | 2 +- service/user/Dockerfile | 18 ++++++++++++++++++ service/user/src/apis/axios.ts | 2 +- 10 files changed, 78 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-admin.yml b/.github/workflows/deploy-admin.yml index a3928a6..2bfd59d 100644 --- a/.github/workflows/deploy-admin.yml +++ b/.github/workflows/deploy-admin.yml @@ -34,3 +34,10 @@ jobs: config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml yarn_docker_build: true yarn_workspace: "@service/${{ env.SERVICE_NAME }}" + buildargs: | + NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }} + NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }} + NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }} + NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }} + NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }} + NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }} diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 1545931..59d5c71 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -34,3 +34,10 @@ jobs: config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml yarn_docker_build: true yarn_workspace: "@service/${{ env.SERVICE_NAME }}" + buildargs: | + NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }} + NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }} + NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }} + NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }} + NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }} + NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }} diff --git a/.github/workflows/deploy-user.yml b/.github/workflows/deploy-user.yml index b2b674c..79b55c4 100644 --- a/.github/workflows/deploy-user.yml +++ b/.github/workflows/deploy-user.yml @@ -34,3 +34,10 @@ jobs: config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml yarn_docker_build: true yarn_workspace: "@service/${{ env.SERVICE_NAME }}" + buildargs: | + NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }} + NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }} + NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }} + NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }} + NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }} + NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }} diff --git a/service/admin/Dockerfile b/service/admin/Dockerfile index e69b600..9e32ee0 100644 --- a/service/admin/Dockerfile +++ b/service/admin/Dockerfile @@ -14,6 +14,24 @@ RUN yarn workspace @service/admin build FROM node:20.10.0-alpine AS runner WORKDIR /app +ARG NEXT_PUBLIC_BASE_URL +ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL} + +ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID +ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID} + +ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI +ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI} + +ARG NEXT_PUBLIC_GOOGLE_SCOPE +ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE} + +ARG NEXT_PUBLIC_KAKAO_CLIENT_ID +ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID} + +ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI +ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI} + ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs diff --git a/service/admin/src/apis/axios.ts b/service/admin/src/apis/axios.ts index 94c04eb..4f9c068 100644 --- a/service/admin/src/apis/axios.ts +++ b/service/admin/src/apis/axios.ts @@ -2,7 +2,7 @@ import axios, { AxiosError } from 'axios' export const instance = axios.create({ baseURL: process.env.NEXT_PUBLIC_BASE_URL, - timeout: 10000, + timeout: 30000, }) instance.interceptors.request.use( diff --git a/service/main/Dockerfile b/service/main/Dockerfile index 48daa63..256d2cf 100644 --- a/service/main/Dockerfile +++ b/service/main/Dockerfile @@ -14,6 +14,24 @@ RUN yarn workspace @service/main build FROM node:20.10.0-alpine AS runner WORKDIR /app +ARG NEXT_PUBLIC_BASE_URL +ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL} + +ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID +ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID} + +ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI +ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI} + +ARG NEXT_PUBLIC_GOOGLE_SCOPE +ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE} + +ARG NEXT_PUBLIC_KAKAO_CLIENT_ID +ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID} + +ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI +ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI} + ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs diff --git a/service/main/next.config.js b/service/main/next.config.js index 8cce8d0..019b7a7 100644 --- a/service/main/next.config.js +++ b/service/main/next.config.js @@ -8,14 +8,6 @@ const nextConfig = { // experimental: { // outputFileTracingRoot: path.join(__dirname, '../../'), // } - async rewrites() { - return [ - { - source: '/:path*', - destination: 'https://stag-server.xquare.app/:path*', - }, - ] - }, } module.exports = nextConfig diff --git a/service/main/src/apis/axios.ts b/service/main/src/apis/axios.ts index 91d934f..ff51fdf 100644 --- a/service/main/src/apis/axios.ts +++ b/service/main/src/apis/axios.ts @@ -1,7 +1,7 @@ import axios, { AxiosError } from 'axios' export const instance = axios.create({ - baseURL: '/maeumgagym', + baseURL: process.env.NEXT_PUBLIC_BASE_URL, timeout: 30000, withCredentials: true, }) diff --git a/service/user/Dockerfile b/service/user/Dockerfile index a96e683..0daf0ae 100644 --- a/service/user/Dockerfile +++ b/service/user/Dockerfile @@ -14,6 +14,24 @@ RUN yarn workspace @service/user build FROM node:20.10.0-alpine AS runner WORKDIR /app +ARG NEXT_PUBLIC_BASE_URL +ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL} + +ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID +ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID} + +ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI +ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI} + +ARG NEXT_PUBLIC_GOOGLE_SCOPE +ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE} + +ARG NEXT_PUBLIC_KAKAO_CLIENT_ID +ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID} + +ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI +ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI} + ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs diff --git a/service/user/src/apis/axios.ts b/service/user/src/apis/axios.ts index 94c04eb..4f9c068 100644 --- a/service/user/src/apis/axios.ts +++ b/service/user/src/apis/axios.ts @@ -2,7 +2,7 @@ import axios, { AxiosError } from 'axios' export const instance = axios.create({ baseURL: process.env.NEXT_PUBLIC_BASE_URL, - timeout: 10000, + timeout: 30000, }) instance.interceptors.request.use(