diff --git a/Dockerfile b/Dockerfile index 6504f15ae..2e1ebeaf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,6 @@ WORKDIR ${SERVER_WORKDIR} COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms +COPY --from=builder ${SERVER_WORKDIR}/_output/bin-tools/platforms /openim/openim-server/_output/bin-tools/platforms CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"] diff --git a/scripts/docker_start_all.sh b/scripts/docker_start_all.sh index f617c5057..5ddd68dab 100755 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -30,6 +30,14 @@ need_to_start_server_shell=( ${SCRIPTS_ROOT}/start_cron.sh ) +component_check=start_component_check.sh +./$component_check +if [ $? -ne 0 ]; then + # Print error message and exit + echo "${BOLD_PREFIX}${RED_PREFIX}Error executing ${component_check}. Exiting...${COLOR_SUFFIX}" + exit -1 +fi + #fixme The 10 second delay to start the project is for the docker-compose one-click to start openIM when the infrastructure dependencies are not started sleep 10