diff --git a/.ohyee/action.bash b/.ohyee/action.bash index ebce412..4b6d3c4 100644 --- a/.ohyee/action.bash +++ b/.ohyee/action.bash @@ -41,7 +41,7 @@ else yarn &>>$LOG_FILE screen -S ${SCREEN_NAME} -X quit &>>$LOG_FILE screen -wipe &>>$LOG_FILE - screen -dmS ${SCREEN_NAME} 'yarn start 1>>front.log 2>>front.err' &>>$LOG_FILE + screen -dmS ${SCREEN_NAME} bash -c 'yarn start 1>>front.log 2>>front.err' &>>$LOG_FILE func_log "rebuild at $(date -u '+%Y-%m-%d %H:%M:%S')" fi diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0bb81e7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM node:15.14.0 + +ENV backendURI="http://backend:50000" + +COPY . /data/blotter_page + +WORKDIR /data/blotter_page + +ENTRYPOINT [ "yarn", "start"] \ No newline at end of file diff --git a/build.bash b/build.bash new file mode 100644 index 0000000..626fa32 --- /dev/null +++ b/build.bash @@ -0,0 +1,31 @@ +#!/bin/bash + +SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) +IMAGE="node:15.14.0" + + +# 拉取镜像 +if [[ $(docker images ${IMAGE} | wc -l) -eq "1" ]]; then + echo "Pulling docker image ${IMAGE}..." + docker pull ${IMAGE} +fi + +# 更新代码 +echo "Pulling latest code..." +git pull + + +# 在 docker 中挂载当前目录编译 +echo "Building execute in docker..." + +docker run --rm \ + -v ${SHELL_FOLDER}:/data/blotter_page \ + ${IMAGE} \ + bash -c "cd /data/blotter_page && echo 'Generating...' && yarn && yarn build" + +echo "Build finished" + +docker build -t blotter_page . + +echo "Docker image 'blotter' build finished." +echo 'Using `docker run --rm --name=frontend --link backend:backend blotter_page` to start server.' \ No newline at end of file diff --git a/utils/request.ts b/utils/request.ts index 053a0ef..6259b8c 100644 --- a/utils/request.ts +++ b/utils/request.ts @@ -1,10 +1,13 @@ import { message } from '@/components/notification'; import axios from 'axios'; +import { env } from 'process'; + +const backendURI = !!process.env["backendURI"] ? process.env["backendURI"]: 'http://127.0.0.1:50000' function parseURL(url: string): string { return (url.length > 0 && url[0] !== '/') || typeof document !== 'undefined' ? url - : 'http://127.0.0.1:50000' + url; + : backendURI + url; } // export const requestAsync = async (method: 'post' | 'get', url: string, data: any) => {