From 9afc4c809f73613d81d7d5c1a19d48d2ac4d69c2 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Fri, 28 Jul 2023 22:46:42 +0800 Subject: [PATCH] fix: docker images Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .env | 4 ++-- Dockerfile | 4 ++-- docker-compose.yaml | 4 ++-- scripts/make-rules/golang.mk | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 910d864b81..412b750766 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ USER=root PASSWORD=openIM123 -MINIO_ENDPOINT=http://113.99.98.99:10005 -API_URL=http://113.99.98.99:10002/object/ +MINIO_ENDPOINT=http://127.0.0.1:10005 +API_URL=http://127.0.0.1:10002/object/ DATA_DIR=./ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8a230a431b..85afdf98b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN /bin/sh -c "make build" FROM alpine RUN echo "https://mirrors.aliyun.com/alpine/v3.4/main" > /etc/apk/repositories && \ - apk --no-cache add tzdata ca-certificates + apk --no-cache add tzdata ca-certificates bash # Set directory to map logs, config files, scripts, and SDK VOLUME ["/Open-IM-Server/logs", "/Open-IM-Server/config", "/Open-IM-Server/scripts", "/Open-IM-Server/db/sdk"] @@ -34,4 +34,4 @@ COPY --from=builder /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-S WORKDIR /Open-IM-Server/scripts -CMD ["docker_start_all.sh"] \ No newline at end of file +CMD ["./docker_start_all.sh"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index cd80dbf199..d5565ca523 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -100,7 +100,7 @@ services: openim_server: - image: ghcr.io/openimsdk/openim-server:v3.0 + image: ghcr.io/openimsdk/openim-server:v3.1.0 container_name: openim-server volumes: - ./logs:/Open-IM-Server/logs @@ -124,7 +124,7 @@ services: max-file: "2" openim_chat: - image: ghcr.io/openimsdk/openim-chat:v1.0.0 + image: ghcr.io/openimsdk/openim-chat:v1.1.0 container_name: openim_chat restart: always depends_on: diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index 00e0fee47d..aebf70e68a 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -131,11 +131,11 @@ go.build.%: $(BIN_DIR)/platforms/$(OS)/$(ARCH)/$(COMMAND)$(GO_OUT_EXT) $(ROOT_DIR)/cmd/$(COMMAND)/main.go; \ fi -## go.install: Install deployment openim -.PHONY: go.install -go.install: - @echo "===========> Installing deployment openim" - @$(ROOT_DIR)/scripts/install_im_server.sh +# ## go.install: Install deployment openim +# .PHONY: go.install +# go.install: +# @echo "===========> Installing deployment openim" +# @$(ROOT_DIR)/scripts/install_im_server.sh ## go.check: Check OpenIM deployment .PHONY: go.check