From ea85505800db1d508bbbd1a421f60c949b4af2f8 Mon Sep 17 00:00:00 2001
From: nxn <nixiaoning@163.com>
Date: Fri, 30 Sep 2022 12:09:11 +0800
Subject: [PATCH] fix windows image error

---
 deploy_k8s/win_build_push_all_images.cmd | 28 ------------------------
 {deploy_k8s => helm}/temp.Dockerfile     |  0
 helm/win_build_push_all_images.cmd       | 23 +++++++++++++++++++
 helm/win_cross_build_all_service.cmd     | 27 +++++++++++++++++++++++
 4 files changed, 50 insertions(+), 28 deletions(-)
 delete mode 100644 deploy_k8s/win_build_push_all_images.cmd
 rename {deploy_k8s => helm}/temp.Dockerfile (100%)
 create mode 100644 helm/win_build_push_all_images.cmd
 create mode 100644 helm/win_cross_build_all_service.cmd

diff --git a/deploy_k8s/win_build_push_all_images.cmd b/deploy_k8s/win_build_push_all_images.cmd
deleted file mode 100644
index 4064e3f3c..000000000
--- a/deploy_k8s/win_build_push_all_images.cmd
+++ /dev/null
@@ -1,28 +0,0 @@
-SET ROOT=%cd%
-@echo off
-echo "ensure run Open-IM-Server/scipt/win_build_all_service.cmd first"
-echo "ensure run Open-IM-Server/scipt/win_build_all_service.cmd first"
-echo "ensure run Open-IM-Server/scipt/win_build_all_service.cmd first"
-echo "ensure run Open-IM-Server/scipt/win_build_all_service.cmd first"
-echo "ensure run Open-IM-Server/scipt/win_build_all_service.cmd first"
-set version=v2.2.0
-for %%I in (
-  api
-  cms_api
-  user
-  friend
-  group
-  auth
-  admin_cms
-  office
-  organization
-  conversation
-  cache
-  msg_gateway
-  msg_transfer
-  msg
-  push
-  sdk_server
-  demo
-) do  docker build -t openim/%%I:%version% --build-arg SER_NAME=%%I.exe ../ -f temp.Dockerfile
-cd %ROOT%
\ No newline at end of file
diff --git a/deploy_k8s/temp.Dockerfile b/helm/temp.Dockerfile
similarity index 100%
rename from deploy_k8s/temp.Dockerfile
rename to helm/temp.Dockerfile
diff --git a/helm/win_build_push_all_images.cmd b/helm/win_build_push_all_images.cmd
new file mode 100644
index 000000000..d589f3234
--- /dev/null
+++ b/helm/win_build_push_all_images.cmd
@@ -0,0 +1,23 @@
+SET ROOT=%cd%
+@echo off
+set version=v2.2.0
+for %%I in (
+  api
+  cms_api
+  user
+  friend
+  group
+  auth
+  admin_cms
+  office
+  organization
+  conversation
+  cache
+  msg_gateway
+  msg_transfer
+  msg
+  push
+  sdk_server
+  demo
+) do  docker build -t openim/%%I:%version% --build-arg SER_NAME=%%I ../ -f temp.Dockerfile
+cd %ROOT%
\ No newline at end of file
diff --git a/helm/win_cross_build_all_service.cmd b/helm/win_cross_build_all_service.cmd
new file mode 100644
index 000000000..b9b81e0be
--- /dev/null
+++ b/helm/win_cross_build_all_service.cmd
@@ -0,0 +1,27 @@
+SET ROOT=%cd%
+mkdir %ROOT%\..\bin\
+set GOARCH=amd64
+go env -w GOARCH=amd64
+set GOOS=linux
+cd ..\cmd\open_im_api\ && go build -ldflags="-w -s" && move open_im_api %ROOT%\..\bin\
+cd ..\..\cmd\open_im_cms_api\ && go build -ldflags="-w -s" && move open_im_cms_api %ROOT%\..\bin\
+cd ..\..\cmd\open_im_demo\ && go build -ldflags="-w -s" && move open_im_demo %ROOT%\..\bin\
+cd ..\..\cmd\open_im_msg_gateway\ && go build -ldflags="-w -s" && move open_im_msg_gateway %ROOT%\..\bin\
+cd ..\..\cmd\open_im_msg_transfer\ && go build -ldflags="-w -s" && move open_im_msg_transfer %ROOT%\..\bin\
+cd ..\..\cmd\open_im_push\ && go build -ldflags="-w -s" && move open_im_push %ROOT%\..\bin\
+cd ..\..\cmd\rpc\open_im_admin_cms\&& go build -ldflags="-w -s" && move open_im_admin_cms %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_auth\&& go build -ldflags="-w -s" && move open_im_auth %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_cache\&& go build -ldflags="-w -s" && move open_im_cache %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_conversation\&& go build -ldflags="-w -s" && move open_im_conversation %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_friend\&& go build -ldflags="-w -s" && move open_im_friend %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_group\&& go build -ldflags="-w -s" && move open_im_group %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_message_cms\&& go build -ldflags="-w -s" && move open_im_message_cms %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_msg\&& go build -ldflags="-w -s" && move open_im_msg %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_office\&& go build -ldflags="-w -s" && move open_im_office %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_organization\&& go build -ldflags="-w -s" && move open_im_organization %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_statistics\&& go build -ldflags="-w -s" && move open_im_statistics %ROOT%\..\bin\
+cd ..\..\..\cmd\rpc\open_im_user\&& go build -ldflags="-w -s" && move open_im_user %ROOT%\..\bin\
+cd ..\..\..\cmd\Open-IM-SDK-Core\ws_wrapper\cmd\&& go build -ldflags="-w -s" open_im_sdk_server.go && move open_im_sdk_server %ROOT%\..\bin\
+go env -w GOARCH=amd64
+go env -w GOOS=windows
+cd %ROOT%
\ No newline at end of file