From 809c2bd55c3fcf0cb65eb7b6f6896fb19379a459 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Wed, 2 Aug 2023 17:46:43 +0800 Subject: [PATCH] fix: dockerfile path Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .goreleaser.yaml | 15 ++++++++------- build/docker/openim-api/Dockerfile | 2 +- cmd/openim-api/deploy.Dockerfile | 4 ++-- cmd/openim-crontask/deploy.Dockerfile | 4 ++-- cmd/openim-msggateway/deploy.Dockerfile | 4 ++-- cmd/openim-msgtransfer/deploy.Dockerfile | 4 ++-- cmd/openim-push/deploy.Dockerfile | 4 ++-- cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile | 4 ++-- .../openim-rpc-conversation/deploy.Dockerfile | 4 ++-- .../openim-rpc-friend/deploy.Dockerfile | 4 ++-- cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile | 4 ++-- cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile | 4 ++-- cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile | 4 ++-- cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile | 4 ++-- 14 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index bf7ef81f5..184949283 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -490,18 +490,14 @@ release: ## Helping out - We release logs are recorded on [✨ CHANGELOG](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CHANGELOG/CHANGELOG.md)--config_folder_path + + We release logs are recorded on [✨CHANGELOG](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CHANGELOG/CHANGELOG.md) - For information on versions of OpenIM and how to maintain branches, read [📚this article](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) + + For information on versions of OpenIM and how to maintain branches, read [📚this article](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) - This release is only possible thanks to **all** the support of some **awesome people**! - - If you wish to use mirroring, read OpenIM's [image management policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) + + If you wish to use mirroring, read OpenIM's [image management policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md) **Want to be one of them 😘?** - Contributions to this project are welcome! Please see [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md) for details. -

@@ -514,6 +510,11 @@ release:

+ > **Note** + > @openimbot and @kubbot have made great contributions to the community as community 🤖robots(@openimsdk/bot), respectively. + > Thanks to the @openimsdk/openim team for all their hard work on this release. + > Thank you to all the [💕developers and contributors](https://github.com/OpenIMSDK/Open-IM-Server/graphs/contributors), people from all over the world, OpenIM brings us together + > Contributions to this project are welcome! Please see [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md) for details. ## Get Involved with OpenIM! diff --git a/build/docker/openim-api/Dockerfile b/build/docker/openim-api/Dockerfile index 607e2145c..c64e2dc12 100644 --- a/build/docker/openim-api/Dockerfile +++ b/build/docker/openim-api/Dockerfile @@ -39,7 +39,7 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR ${CHAT_WORKDIR} COPY --from=builder ${OPENIM_CHAT_BINDIR}/open_im_admin_api /openim/openim-chat/bin/open_im_admin_api -COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config.yaml +COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-server/config/config.yaml env PORT=10002 diff --git a/cmd/openim-api/deploy.Dockerfile b/cmd/openim-api/deploy.Dockerfile index 3479e0cd3..56dd4a106 100644 --- a/cmd/openim-api/deploy.Dockerfile +++ b/cmd/openim-api/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-api ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-api","--port", "10002"] diff --git a/cmd/openim-crontask/deploy.Dockerfile b/cmd/openim-crontask/deploy.Dockerfile index ba5230c42..9ada56d26 100644 --- a/cmd/openim-crontask/deploy.Dockerfile +++ b/cmd/openim-crontask/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-crontask ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-crontask"] diff --git a/cmd/openim-msggateway/deploy.Dockerfile b/cmd/openim-msggateway/deploy.Dockerfile index 7ba0d2235..31a30ff4b 100644 --- a/cmd/openim-msggateway/deploy.Dockerfile +++ b/cmd/openim-msggateway/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-msg_gateway ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-msg_gateway","--port", "10140" "--ws_port", "10001", "--prometheus_port", "20240"] diff --git a/cmd/openim-msgtransfer/deploy.Dockerfile b/cmd/openim-msgtransfer/deploy.Dockerfile index 78f1f955c..7eedcbdbc 100644 --- a/cmd/openim-msgtransfer/deploy.Dockerfile +++ b/cmd/openim-msgtransfer/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-msgtransfer ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-msgtransfer","--prometheus_port", "21400"] diff --git a/cmd/openim-push/deploy.Dockerfile b/cmd/openim-push/deploy.Dockerfile index 67774a6f7..6e4e44525 100644 --- a/cmd/openim-push/deploy.Dockerfile +++ b/cmd/openim-push/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-push ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-push", "--port", "10170", "--prometheus_port", "20170"] diff --git a/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile index b529860f9..6d034303c 100644 --- a/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-auth ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-auth", "--port", "10160"] diff --git a/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile index 33e5c93c1..8245e3ca1 100644 --- a/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-conversation ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-conversation", "--port", "10230", "--prometheus_port","20230"] diff --git a/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile index f306a7938..5f842a631 100644 --- a/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-friend ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-friend", "--port", "10120", "--prometheus_port","20120"] diff --git a/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile index ed46edcf7..42fe164df 100644 --- a/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-group ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-group", "--port", "10150", "--prometheus_port","20150"] diff --git a/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile index 61737417e..754d782a0 100644 --- a/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-msg ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-msg", "--port", "10130", "--prometheus_port","20130"] diff --git a/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile index 29bc2d068..664ad452c 100644 --- a/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-third ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-third", "--port", "10200"] diff --git a/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile index 8ab7df1e7..f9663c9ba 100644 --- a/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu -WORKDIR /Open-IM-Server/bin +WORKDIR /openim/openim-server/bin RUN apt-get update && apt-get install apt-transport-https && apt-get install procps\ &&apt-get install net-tools @@ -27,6 +27,6 @@ RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl COPY ./openim-rpc-user ./ -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] +VOLUME ["/openim/openim-server/logs","/openim/openim-server/config"] CMD ["./openim-rpc-user", "--port", "10110"]