From 6bf80789ed8bda821df422a97e4b7cac09efa304 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Fri, 5 Jan 2024 10:51:57 +0800 Subject: [PATCH] fix openim config mongo passwd env Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> --- .github/workflows/openimci.yml | 3 +++ scripts/install-im-server.sh | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml index d16e91ba4..bf59daf33 100644 --- a/.github/workflows/openimci.yml +++ b/.github/workflows/openimci.yml @@ -128,6 +128,8 @@ jobs: - name: Run OpenIM make install start run: | sudo make install + sudo docker images + sudo docker ps execute-scripts: name: Execute OpenIM Script On ${{ matrix.os }} @@ -245,3 +247,4 @@ jobs: run: | sudo make init sudo make image + sudo docker images diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh index a21ae134d..426b29b7a 100755 --- a/scripts/install-im-server.sh +++ b/scripts/install-im-server.sh @@ -15,6 +15,8 @@ # Common utilities, variables and checks for all build scripts. +# This script works by building an IM image locally +# and then using the IM built image to deploy tests on openim-docker set -o errexit set -o nounset set -o pipefail @@ -31,7 +33,6 @@ openim::util::ensure_docker_daemon_connectivity DOCKER_COMPOSE_COMMAND= # Check if docker-compose command is available openim::util::check_docker_and_compose_versions - if command -v docker compose &> /dev/null then openim::log::info "docker compose command is available" @@ -40,8 +41,11 @@ else DOCKER_COMPOSE_COMMAND="docker-compose" fi +export SERVER_IMAGE_VERSION=test +export IMAGE_REGISTRY=openim "${OPENIM_ROOT}"/scripts/init-config.sh pushd "${OPENIM_ROOT}" +docker build -t openim/openim-server:test . ${DOCKER_COMPOSE_COMMAND} stop curl https://raw.githubusercontent.com/openimsdk/openim-docker/main/docker-compose.yaml -o docker-compose.yml ${DOCKER_COMPOSE_COMMAND} up -d