diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 39ad73a06..727a08520 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: admin-cms # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: admin-cms - image: openim/admin_cms:v2.0.10k + image: openim/admin_cms:v2.1.0 # imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index ee9d0c8a7..1a74ae7a1 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: api # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,8 +15,8 @@ spec: spec: containers: - name: api - image: openim/api:v2.0.10k - imagePullPolicy: Always + image: openim/api:v2.1.0 + # imagePullPolicy: Always ports: - containerPort: 10002 volumeMounts: @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index 04fbdf32a..15eafd782 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index d6b2e91d8..5b60d77f7 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: auth # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: auth - image: openim/auth:v2.0.10k + image: openim/auth:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10160 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index b6333a8bd..6f46bf33c 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -2,7 +2,7 @@ source ./path_info.cfg # images version -version=v2.0.10k +version=v2.1.0 git pull cd ../script/; ./build_all_service.sh cd ../deploy_k8s/ diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index e69d131ab..13c5278bd 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index 5de56fcf0..ef41d2bde 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: cache # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: cache - image: openim/cache:v2.0.10k + image: openim/cache:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10240 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 64c4ae25a..78eda6ecf 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -13,5 +14,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 9f66431d2..6f3fd5b2d 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: cms-api # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,8 +15,8 @@ spec: spec: containers: - name: cms-api - image: openim/cms_api:v2.0.10k - # imagePullPolicy: Always + image: openim/cms_api:v2.1.0 + imagePullPolicy: Always ports: - containerPort: 10006 volumeMounts: @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index 4518627d3..bea8d4b00 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -13,5 +14,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 7da7aad7a..90b6bdab1 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: conversation - image: openim/conversation:v2.0.10k + image: openim/conversation:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10230 @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index 05b532fd4..8b829dde0 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 228cc8278..8c612d153 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: demo # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: demo - image: openim/demo:v2.0.10k + image: openim/demo:v2.1.0 imagePullPolicy: Always ports: - containerPort: 10004 @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index a03ca12c7..c521c7a3e 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: friend # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: friend - image: openim/friend:v2.0.10k + image: openim/friend:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10120 @@ -26,7 +26,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 3741a7c89..54f430e01 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 74aaa0d5a..a27dc2547 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: group # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: group - image: openim/group:v2.0.10k + image: openim/group:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10150 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 7b902ee67..9baa7b5e9 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 010a8d09e..0fb623d46 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/deploy_k8s/k8s_openim_deploy.md @@ -5,7 +5,7 @@ ### 2. 项目根目录创建im configMap到k8s openim namespace kubectl create namespace openim -kubectl -n openim create configmap config --from-file=config/config.yaml +kubectl -n openim create configmap openim-config --from-file=config/config.yaml openim 为im项目的namespace, 可选 查看configmap kubectl -n openim get configmap diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 148316e5b..8c5e3e83d 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: message-cms # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: message-cms - image: openim/message_cms:v2.0.10k + image: openim/message_cms:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10190 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index f77ebc3c2..24d08ece9 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index a4697c631..4e6873699 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: msg # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg - image: openim/msg:v2.0.10k + image: openim/msg:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10130 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 50299b41d..54a54f9bf 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml @@ -15,5 +16,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 72352386e..604af28dd 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: msg-gateway # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg-gateway - image: openim/msg_gateway:v2.0.10k + image: openim/msg_gateway:v2.1.0 # imagePullPolicy: Always ports: - name: rpc-port @@ -29,7 +29,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 48441eb56..8954af854 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index cbb44717e..459a93410 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: msg-transfer # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg-transfer - image: openim/msg_transfer:v2.0.10k + image: openim/msg_transfer:v2.1.0 # imagePullPolicy: Always volumeMounts: - name: config @@ -24,6 +24,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index 68c3f3819..9d103ce07 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 333a11aba..c7a6c1da5 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: office # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: office - image: openim/office:v2.0.10k + image: openim/office:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10210 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index c6db928fa..8144deaa1 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -2,8 +2,10 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 ADD ./open_im_office $WORKDIR/cmd/main @@ -14,5 +16,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index a32488d44..fce6fde5a 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: organization # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: organization - image: openim/organization:v2.0.10k + image: openim/organization:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10220 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index 345ee9692..9a824f1fe 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -15,5 +16,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index c1a8d0299..14ba13fdd 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: push # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: push - image: openim/push:v2.0.10k + image: openim/push:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10170 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index 2904ce56f..92409d225 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml @@ -15,5 +16,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 063b3d9d9..f99e67006 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: sdk-server # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: sdk-server - image: openim/sdk_server:v2.0.10k + image: openim/sdk_server:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10003 @@ -30,7 +30,7 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config - name: local-db hostPath: path: /db/sdk diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index e38369bcb..9a6eaf8fe 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -13,5 +14,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] -WORKDIR $WORKDIR +WORKDIR $CMDDIR CMD ./main \ No newline at end of file diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index 3743d7e6b..d7cc5e15b 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: statistics # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: statistics - image: openim/statistics:v2.0.10k + image: openim/statistics:v2.1.0 # imagePullPolicy: Always ports: - containerPort: 10180 @@ -26,6 +26,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index 44e8f2fe1..e271aca29 100644 --- a/deploy_k8s/statistics/statistics.Dockerfile +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 1ad605d14..6473094f0 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -7,7 +7,7 @@ spec: selector: matchLabels: app: user # 选择这个指定标签执行 - replicas: 2 # 运行pod数量 + replicas: 1 # 运行pod数量 template: metadata: labels: @@ -15,7 +15,7 @@ spec: spec: containers: - name: user - image: openim/user:v2.0.10k + image: openim/user:v2.1.0 # imagePullPolicy: Always volumeMounts: - name: config @@ -24,6 +24,6 @@ spec: volumes: - name: config configMap: - name: config + name: openim-config strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index 3218949d4..813757d85 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu # 设置固定的项目路径 ENV WORKDIR /Open-IM-Server +ENV CMDDIR $WORKDIR/cmd ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 @@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -WORKDIR $WORKDIR -CMD ./cmd/main \ No newline at end of file +WORKDIR $CMDDIR +CMD ./main \ No newline at end of file