build(other): dockerfile update

.dockerignore

@@ -1,6 +1,5 @@
 node_modules
 .DS_Store
-dist
 .npmrc
 .cache
 

Dockerfile

@@ -1,18 +1,20 @@
-FROM node:latest as builder
-WORKDIR /app/kpt-system-web
+#FROM node:16.17.0 as builder
+#WORKDIR /app/kpt-system-web
 #拷贝源码
-COPY . .
+#COPY . .
 #安装依赖
-RUN npm config set registry https://registry.npmmirror.com/
-RUN npm install -g pnpm
-
-RUN pnpm install && pnpm i --save-dev @types/lodash-es && pnpm i --save-dev @types/mockjs
+#RUN npm install -g pnpm
+#RUN pnpm i --save-dev @types/lodash-es && pnpm i --save-dev @types/mockjs
+#RUN pnpm install
 
 # 开始构建
-RUN pnpm run build -- --max-old-space-size=4096
+#RUN pnpm build
 
 # 第二阶段构建
 FROM nginx:alpine as prod
-COPY --from=builder /app/kpt-system-web/dist/ /usr/share/nginx/html/
-COPY --from=builder /app/kpt-system-web/default.conf.template /etc/nginx/conf.d/default.conf
+
+WORKDIR /app/kpt-system-web
+
+COPY ./dist/ /usr/share/nginx/html/
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80

Makefile

@@ -1,15 +1,14 @@
 ImageTag ?=v0.9.6
-SoybeanAdminImg ?= soybeanjs/soybean-admin:$(ImageTag)
+KptSystemWebImg ?=kpt-event/kpt-system-web:$(ImageTag)
 
 VERSION=$(shell git rev-parse --short HEAD)
 
-soybean-admin: soybean-admin-build soybean-admin-push
-
-soybean-admin-build:
-	docker build --build-arg version=$(VERSION) -t ${SoybeanAdminImg} -f ./Dockerfile .
-
-soybean-admin-push:
-	docker push ${SoybeanAdminImg}
+img-build:
+	#docker login registry.cn-hangzhou.aliyuncs.com --username kptzhu@163.com --password zhuz1898
+	docker build --build-arg version=$(VERSION) -t ${KptSystemWebImg} -f ./Dockerfile .
+	docker tag ${KptSystemWebImg}  registry.cn-hangzhou.aliyuncs.com/${KptSystemWebImg}
+	docker push registry.cn-hangzhou.aliyuncs.com/${KptSystemWebImg}
+	docker rmi ${KptSystemWebImg} registry.cn-hangzhou.aliyuncs.com/${KptSystemWebImg}
 
 # run tauri app:
 run:

images.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+ImageTag=$1
+if [ -n "$ImageTag" ]
+then
+  echo "当前镜像tag: $ImageTag"
+else
+  echo "请输入当前镜像tag"
+  exit
+fi
+
+current_path=$(pwd)
+echo "当前路径为:$current_path"
+
+### go build
+echo "============ go build start ================"
+make img-build ImageTag="${ImageTag}"
+echo "============push images end ================"

src/service/request/index.ts

@@ -9,4 +9,4 @@ export const request = createRequest({ baseURL: isHttpProxy ? proxyPattern : url
 
 export const mockRequest = createRequest({ baseURL: '/mock' });
 
-export const backgroundRequest = createRequest({ baseURL: 'http://192.168.1.96:8001/api/v1' });
+export const backgroundRequest = createRequest({ baseURL: 'http://192.168.1.70:8085/api/v1' });