Ver Fonte

ci(other): cicd production

Yi há 1 ano atrás
pai
commit
3a79d59595
4 ficheiros alterados com 15 adições e 20 exclusões
  1. 0 13
      Dockerfile
  2. 5 2
      Makefile
  3. 9 4
      images.sh
  4. 1 1
      src/service/request/index.ts

+ 0 - 13
Dockerfile

@@ -1,16 +1,3 @@
-#FROM node:16.17.0 as builder
-#WORKDIR /app/kpt-system-web
-#拷贝源码
-#COPY . .
-#安装依赖
-#RUN npm install -g pnpm
-#RUN pnpm i --save-dev @types/lodash-es && pnpm i --save-dev @types/mockjs
-#RUN pnpm install
-
-# 开始构建
-#RUN pnpm build
-
-# 第二阶段构建
 FROM nginx:alpine as prod
 
 WORKDIR /app/kpt-system-web

+ 5 - 2
Makefile

@@ -4,8 +4,11 @@ KptSystemWebImg ?=kpt-event/kpt-system-web:$(ImageTag)
 VERSION=$(shell git rev-parse --short HEAD)
 
 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 run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+	#docker buildx create --use --name mybuilder
+	docker buildx inspect mybuilder --bootstrap
+	#docker build --build-arg version=$(VERSION) -t ${KptSystemWebImg} -f ./Dockerfile .
+	docker buildx build --build-arg version=$(VERSION) -t ${KptSystemWebImg} -f ./Dockerfile --platform=linux/arm64 -o type=docker .
 	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}

+ 9 - 4
images.sh

@@ -10,10 +10,15 @@ else
   exit
 fi
 
-current_path=$(pwd)
-echo "当前路径为:$current_path"
-
 ### go build
 echo "============ go build start ================"
 make img-build ImageTag="${ImageTag}"
-echo "============push images end ================"
+echo "============push images end ================"
+
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+docker buildx version
+docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+
+#docker buildx create --use --name mybuilder
+docker buildx inspect mybuilder --bootstrap

+ 1 - 1
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.70:8085/api/v1' });
+export const backgroundRequest = createRequest({ baseURL: 'http://vernamq8085.kptyun.com/api/v1' });