From 17bc9596da55400f7996bf16f8eda660687e420f Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Wed, 30 Aug 2023 22:00:01 +0800 Subject: [PATCH] feat: add more test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- build/images/openim-api/Dockerfile | 6 ++---- build/images/openim-crontask/Dockerfile | 4 ++-- build/images/openim-msggateway/Dockerfile | 9 ++++----- build/images/openim-msgtransfer/Dockerfile | 2 +- build/images/openim-push/Dockerfile | 7 +++---- build/images/openim-rpc-auth/Dockerfile | 8 ++++---- build/images/openim-rpc-conversation/Dockerfile | 8 +++----- build/images/openim-rpc-friend/Dockerfile | 8 +++----- build/images/openim-rpc-group/Dockerfile | 8 +++----- build/images/openim-rpc-msg/Dockerfile | 8 +++----- build/images/openim-rpc-third/Dockerfile | 8 ++++---- build/images/openim-rpc-user/Dockerfile | 6 +++--- build/images/openim-tools/component/Dockerfile | 4 ++-- 13 files changed, 37 insertions(+), 49 deletions(-) diff --git a/build/images/openim-api/Dockerfile b/build/images/openim-api/Dockerfile index 2ffd221d0..44d4c6ba4 100644 --- a/build/images/openim-api/Dockerfile +++ b/build/images/openim-api/Dockerfile @@ -43,10 +43,8 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10002 -ENV CONFIG=/openim/openim-server/config - -EXPOSE $PORT +EXPOSE 10002 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api -ENTRYPOINT ["bash", "-c", "openim-api -c $CONFIG --port $PORT"] +ENTRYPOINT ["bash", "-c", "openim-api -c $OPENIM_SERVER_CONFIG_NAME --port $PORT"] diff --git a/build/images/openim-crontask/Dockerfile b/build/images/openim-crontask/Dockerfile index 1472af624..04334e4ff 100644 --- a/build/images/openim-crontask/Dockerfile +++ b/build/images/openim-crontask/Dockerfile @@ -41,8 +41,8 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder /openim/openim-server/config /openim/openim-server/config -ENV CONFIG=/openim/openim-server/config +ENV OPENIM_SERVER_CONFIG_NAME=/openim/openim-server/config RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask -CMD ["bash", "-c", "openim-crontask -c $CONFIG"] +CMD ["bash", "-c", "openim-crontask -c $OPENIM_SERVER_CONFIG_NAME"] diff --git a/build/images/openim-msggateway/Dockerfile b/build/images/openim-msggateway/Dockerfile index 1ebf31c69..35c4c7a1d 100644 --- a/build/images/openim-msggateway/Dockerfile +++ b/build/images/openim-msggateway/Dockerfile @@ -42,12 +42,11 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10140 \ - WS_PORT 10001 \ - CONFIG=/openim/openim-server/config + WS_PORT 10001 -EXPOSE $PORT -EXPOSE $WS_PORT +EXPOSE 10140 +EXPOSE 10001 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway -CMD ["bash", "-c", "openim-msggateway -c $CONFIG --port $PORT --ws_port $WS_PORT"] \ No newline at end of file +CMD ["bash", "-c", "openim-msggateway -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --ws_port $WS_PORT"] \ No newline at end of file diff --git a/build/images/openim-msgtransfer/Dockerfile b/build/images/openim-msgtransfer/Dockerfile index 247529ce4..57d11be52 100644 --- a/build/images/openim-msgtransfer/Dockerfile +++ b/build/images/openim-msgtransfer/Dockerfile @@ -43,4 +43,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $CONFIG --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $CONFIG; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $OPENIM_SERVER_CONFIG_NAME; fi"] \ No newline at end of file diff --git a/build/images/openim-push/Dockerfile b/build/images/openim-push/Dockerfile index de7f3a2b7..287c43450 100644 --- a/build/images/openim-push/Dockerfile +++ b/build/images/openim-push/Dockerfile @@ -43,11 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10170 \ - PROMETHEUS_PORT 20170 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20170 -EXPOSE $PORT +EXPOSE 10170 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $CONFIG --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $CONFIG --port $PORT; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $OPENIM_SERVER_CONFIG_NAME --port $PORT; fi"] \ No newline at end of file diff --git a/build/images/openim-rpc-auth/Dockerfile b/build/images/openim-rpc-auth/Dockerfile index 880ff7737..a581bfc04 100644 --- a/build/images/openim-rpc-auth/Dockerfile +++ b/build/images/openim-rpc-auth/Dockerfile @@ -42,11 +42,11 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ COPY --from=builder /openim/openim-server/config /openim/openim-server/config -ENV PORT 10160 -ENV CONFIG=/openim/openim-server/config +ENV PORT 10160 \ + PROMETHEUS_PORT 20160 -EXPOSE $PORT +EXPOSE 10160 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $CONFIG"; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file diff --git a/build/images/openim-rpc-conversation/Dockerfile b/build/images/openim-rpc-conversation/Dockerfile index 337722715..887a77f36 100644 --- a/build/images/openim-rpc-conversation/Dockerfile +++ b/build/images/openim-rpc-conversation/Dockerfile @@ -43,12 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10230 \ - PROMETHEUS_PORT 20230 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20230 -EXPOSE $PORT -EXPOSE $PROMETHEUS_PORT +EXPOSE 10230 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $CONFIG"; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file diff --git a/build/images/openim-rpc-friend/Dockerfile b/build/images/openim-rpc-friend/Dockerfile index ae3c2c716..9954daf99 100644 --- a/build/images/openim-rpc-friend/Dockerfile +++ b/build/images/openim-rpc-friend/Dockerfile @@ -43,12 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10120 \ - PROMETHEUS_PORT 20120 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20120 -EXPOSE $PORT -EXPOSE $PROMETHEUS_PORT +EXPOSE 10120 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $CONFIG"; fi"] +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] diff --git a/build/images/openim-rpc-group/Dockerfile b/build/images/openim-rpc-group/Dockerfile index 6fc3c9597..627560075 100644 --- a/build/images/openim-rpc-group/Dockerfile +++ b/build/images/openim-rpc-group/Dockerfile @@ -43,12 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10150 \ - PROMETHEUS_PORT 20150 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20150 -EXPOSE $PORT -EXPOSE $PROMETHEUS_PORT +EXPOSE 10150 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $CONFIG"; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file diff --git a/build/images/openim-rpc-msg/Dockerfile b/build/images/openim-rpc-msg/Dockerfile index 3ad24ba8b..e7426bcf0 100644 --- a/build/images/openim-rpc-msg/Dockerfile +++ b/build/images/openim-rpc-msg/Dockerfile @@ -43,12 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10130 \ - PROMETHEUS_PORT 20130 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20130 -EXPOSE $PORT -EXPOSE $PROMETHEUS_PORT +EXPOSE 10130 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $CONFIG"; fi"] \ No newline at end of file +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] \ No newline at end of file diff --git a/build/images/openim-rpc-third/Dockerfile b/build/images/openim-rpc-third/Dockerfile index d413ed81e..700fd2918 100644 --- a/build/images/openim-rpc-third/Dockerfile +++ b/build/images/openim-rpc-third/Dockerfile @@ -43,11 +43,11 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/ COPY --from=builder /openim/openim-server/config /openim/openim-server/config -ENV PORT 10200 \ - CONFIG=/openim/openim-server/config +ENV PORT 10190 \ + PROMETHEUS_PORT 21301 -EXPOSE $PORT +EXPOSE 10190 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $CONFIG"; fi"] +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] diff --git a/build/images/openim-rpc-user/Dockerfile b/build/images/openim-rpc-user/Dockerfile index 1ccb577ef..00804f2bf 100644 --- a/build/images/openim-rpc-user/Dockerfile +++ b/build/images/openim-rpc-user/Dockerfile @@ -43,10 +43,10 @@ COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-s COPY --from=builder /openim/openim-server/config /openim/openim-server/config ENV PORT 10110 \ - CONFIG=/openim/openim-server/config + PROMETHEUS_PORT 20110 -EXPOSE $PORT +EXPOSE 10110 RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user -ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $CONFIG"; fi"] +ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $OPENIM_SERVER_CONFIG_NAME"; fi"] diff --git a/build/images/openim-tools/component/Dockerfile b/build/images/openim-tools/component/Dockerfile index 048b02f70..1be6e776f 100644 --- a/build/images/openim-tools/component/Dockerfile +++ b/build/images/openim-tools/component/Dockerfile @@ -42,8 +42,8 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/ COPY --from=builder /openim/openim-server/config /openim/openim-server/config -ENV CONFIG=/openim/openim-server/config +ENV OPENIM_SERVER_CONFIG_NAME=/openim/openim-server/config RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/component /usr/bin/component -ENTRYPOINT ["bash", "-c", "component -c $CONFIG"] +ENTRYPOINT ["bash", "-c", "component -c $OPENIM_SERVER_CONFIG_NAME"]