fix: chat scripts path bug

Signed-off-by: Xinwei Xiong(cubxxw-openim) <[email protected]>
openimsdk · Aug 9, 2023 · b7d5c48 · b7d5c48
1 parent 5ff6255
commit b7d5c48
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -40,7 +40,7 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR ${CHAT_WORKDIR}
 
-COPY --from=builder ${CHAT_WORKDIR}/_output/bin/platforms /openim/openim-chat/_output/bin/platforms
+COPY --from=builder $OPENIM_CHAT_BINDIR/platforms /openim/openim-chat/_output/bin/platforms
 COPY --from=builder ${OPENIM_CHAT_CMDDIR} /openim/openim-chat/scripts
 COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config.yaml
 

diff --git a/build/docker/api-admin/Dockerfile b/build/docker/api-admin/Dockerfile
@@ -49,4 +49,4 @@ COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config
 ENV PORT=10009
 
 EXPOSE ${PORT}
-CMD ["bash","-c","${OPENIM_CHAT_BINDIR}/platforms/${OS}/${ARCH}/admin-api --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
+CMD ["bash","-c","${OPENIM_CHAT_BINDIR}/platforms/$(get_os)/$(get_arch)/admin-api --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
diff --git a/build/docker/api-chat/Dockerfile b/build/docker/api-chat/Dockerfile
@@ -46,4 +46,4 @@ COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config
 ENV PORT=10008
 
 EXPOSE ${PORT}
-CMD ["bash", "-c","${OPENIM_CHAT_BINDIR}/platforms/${OS}/${ARCH}/chat-api --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
+CMD ["bash", "-c","${OPENIM_CHAT_BINDIR}/platforms/$(get_os)/$(get_arch)/chat-api --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
diff --git a/build/docker/rpc-admin/Dockerfile b/build/docker/rpc-admin/Dockerfile
@@ -46,4 +46,4 @@ COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config
 ENV PORT=30200
 
 EXPOSE ${PORT}
-CMD ["bash", "-c", "${OPENIM_CHAT_BINDIR}/platforms/${OS}/${ARCH}/admin-rpc --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
+CMD ["bash", "-c", "${OPENIM_CHAT_BINDIR}/platforms/$(get_os)/$(get_arch)/admin-rpc --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
diff --git a/build/docker/rpc-chat/Dockerfile b/build/docker/rpc-chat/Dockerfile
@@ -46,4 +46,4 @@ COPY --from=builder ${OPENIM_CHAT_CONFIG_NAME} /openim/openim-chat/config/config
 ENV PORT=30300
 
 EXPOSE ${PORT}
-CMD ["bash", "-c","${OPENIM_CHAT_BINDIR}/platforms/${OS}/${ARCH}/chat-rpc --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]
+CMD ["bash", "-c","${OPENIM_CHAT_BINDIR}/platforms/$(get_os)/$(get_arch)/chat-rpc --port ${PORT} --config_folder_path ${OPENIM_CHAT_CONFIG_NAME}"]