feat: change directory

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
pull/437/head
Xinwei Xiong(cubxxw-openim) 2 years ago
parent 7a5be03af6
commit 6b2b352ad8

2
.gitignore vendored

@ -41,7 +41,7 @@ deploy/open_im_rpc_friend
deploy/open_im_rpc_group
deploy/open_im_rpc_msg
deploy/open_im_rpc_auth
deploy/Open-IM-SDK-Core
deploy/openim-sdk-core
# files used by the developer
.idea.md

@ -93,7 +93,7 @@ Open-IM-Server 是一款即时通讯服务器,使用纯 Golang 开发,采用
```
git clone <https://github.com/OpenIMSDK/Open-IM-Server.git> --recursive
cd cmd/Open-IM-SDK-Core
cd cmd/openim-sdk-core
git checkout main
```

@ -95,7 +95,7 @@ By deployment of the Open-IM-Server on the customer's server, developers can int
```shell
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
cd cmd/Open-IM-SDK-Core
cd cmd/openim-sdk-core
git checkout main
```

@ -93,7 +93,7 @@ Open-IM-Server 是一款即时通讯服务器,使用纯 Golang 开发,采用
```
git clone <https://github.com/OpenIMSDK/Open-IM-Server.git> --recursive
cd cmd/Open-IM-SDK-Core
cd cmd/openim-sdk-core
git checkout main
```

@ -1 +0,0 @@
Subproject commit 4ce07f10e42ac2d6a6bc85a34f05c1ada6f4e5a3

@ -6,29 +6,34 @@ ENV GOPROXY=https://goproxy.cn,direct
# Set up the working directory
WORKDIR /Open-IM-Server
# add all files to the container
COPY . .
RUN chmod +x /Open-IM-Server/script/*.sh && \
/bin/sh -c /Open-IM-Server/script/build_all_service.sh
#Blank image Multi-Stage Build
FROM alpine
WORKDIR /Open-IM-Server/script
RUN chmod +x *.sh
RUN apk add --no-cache vim curl tzdata gawk procps net-tools
RUN /bin/sh -c ./build_all_service.sh
#Blank image Multi-Stage Build
FROM ubuntu
RUN rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\
&&apt-get install net-tools
#Non-interactive operation
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get install -y vim curl tzdata gawk
#Time zone adjusted to East eighth District
RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
dpkg-reconfigure -f noninteractive tzdata
RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
#set directory to map logs,config file,script file.
VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"]
#Copy script files and binary files to the blank image
COPY --from=build --chown=root:root /Open-IM-Server/script /Open-IM-Server/script
COPY --from=build --chown=root:root /Open-IM-Server/bin /Open-IM-Server/bin
#Copy scripts files and binary files to the blank image
COPY --from=build /Open-IM-Server/script /Open-IM-Server/script
COPY --from=build /Open-IM-Server/bin /Open-IM-Server/bin
WORKDIR /Open-IM-Server/script
CMD ["/Open-IM-Server/script/docker_start_all.sh"]
CMD ["./docker_start_all.sh"]

@ -179,5 +179,3 @@ demo:
senderAuthorizationCode:
smtpAddr:
smtpPort:

@ -11,6 +11,5 @@ ADD ./open_im_msg_gateway $WORKDIR/main
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
chmod +x $WORKDIR/main
WORKDIR $WORKDIR
CMD ./main

@ -11,6 +11,5 @@ ADD ./open_im_rpc_auth $WORKDIR/main
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \
chmod +x $WORKDIR/main
WORKDIR $WORKDIR
CMD ./main

@ -6,7 +6,7 @@
make win-build-all
# 得到各个二进制程序之后,打包为镜像
# 目前没有处理 Open-IM-SDK-Core ,需要的话可以自己单独处理这个模块
# 目前没有处理 openim-sdk-core ,需要的话可以自己单独处理这个模块
make image-all
# docker-compose.yaml 分成了两部分一部分是openIM的镜像容器 openim.yaml一部分是依赖的环境 env.yaml

@ -14,6 +14,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
WORKDIR $CMDDIR
CMD ./main

@ -4,7 +4,7 @@ rm Open-IM-Server -rf
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
cd Open-IM-Server
git checkout tuoyun
cd cmd/Open-IM-SDK-Core/
cd cmd/openim-sdk-core/
git checkout tuoyun
cd ../../
docker build -t $image . -f deploy.Dockerfile

@ -70,7 +70,7 @@ EXCLUDE_TESTS=github.com/OpenIMSDK/Open-IM-Server/test github.com/OpenIMSDK/Open
# ==============================================================================
# tree -L 1 cmd
# cmd
# ├── Open-IM-SDK-Core/ - main.go
# ├── openim-sdk-core/ - main.go
# ├── open_im_api
# ├── open_im_cms_api
# ├── open_im_cron_task

@ -21,7 +21,7 @@ msg_transfer_service_num=4
sdk_server_name="open_im_sdk_server"
sdk_server_binary_root="../bin/"
sdk_server_source_root="../cmd/Open-IM-SDK-Core/"
sdk_server_source_root="../cmd/openim-sdk-core/"
demo_server_name="open_im_demo"
demo_server_binary_root="../bin/"

@ -18,5 +18,5 @@ cd ..\..\..\cmd\rpc\open_im_office\&& go build -ldflags="-w -s" && move open_im_
cd ..\..\..\cmd\rpc\open_im_organization\&& go build -ldflags="-w -s" && move open_im_organization.exe %ROOT%\..\bin\
cd ..\..\..\cmd\rpc\open_im_statistics\&& go build -ldflags="-w -s" && move open_im_statistics.exe %ROOT%\..\bin\
cd ..\..\..\cmd\rpc\open_im_user\&& go build -ldflags="-w -s" && move open_im_user.exe %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.exe %ROOT%\..\bin\
cd ..\..\..\cmd\openim-sdk-core\ws_wrapper\cmd\&& go build -ldflags="-w -s" open_im_sdk_server.go && move open_im_sdk_server.exe %ROOT%\..\bin\
cd %ROOT%
Loading…
Cancel
Save