From d83437528b756deb70c9e2d80a3cdf12c781e456 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Fri, 4 Aug 2023 19:06:19 +0800
Subject: [PATCH] fix: super docker version

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 Dockerfile                                      | 2 +-
 build/docker/openim-api/Dockerfile              | 2 +-
 build/docker/openim-cmdutils/Dockerfile         | 2 +-
 build/docker/openim-crontask/Dockerfile         | 2 +-
 build/docker/openim-msggateway/Dockerfile       | 2 +-
 build/docker/openim-msgtransfer/Dockerfile      | 2 +-
 build/docker/openim-push/Dockerfile             | 2 +-
 build/docker/openim-rpc-auth/Dockerfile         | 2 +-
 build/docker/openim-rpc-conversation/Dockerfile | 2 +-
 build/docker/openim-rpc-friend/Dockerfile       | 2 +-
 build/docker/openim-rpc-group/Dockerfile        | 2 +-
 build/docker/openim-rpc-msg/Dockerfile          | 2 +-
 build/docker/openim-rpc-third/Dockerfile        | 2 +-
 build/docker/openim-rpc-user/Dockerfile         | 2 +-
 docker-compose.yaml                             | 6 +++---
 pkg/common/config/version                       | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c2772fc6..4be4861f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ ADD . .
 RUN /bin/sh -c "make clean"
 RUN /bin/sh -c "make build"
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR ${SERVER_WORKDIR}
 
diff --git a/build/docker/openim-api/Dockerfile b/build/docker/openim-api/Dockerfile
index 3efa2af39..b0760a6d7 100644
--- a/build/docker/openim-api/Dockerfile
+++ b/build/docker/openim-api/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN make clean
 RUN make build BINS=openim-api
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-cmdutils/Dockerfile b/build/docker/openim-cmdutils/Dockerfile
index 8eeca87a4..91e97b76f 100644
--- a/build/docker/openim-cmdutils/Dockerfile
+++ b/build/docker/openim-cmdutils/Dockerfile
@@ -21,7 +21,7 @@ RUN go mod download
 RUN make clean
 RUN make build BINS=openim-cmdutils
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-crontask/Dockerfile b/build/docker/openim-crontask/Dockerfile
index 0257d5078..06847dc72 100644
--- a/build/docker/openim-crontask/Dockerfile
+++ b/build/docker/openim-crontask/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN make clean
 RUN make build BINS=openim-crontask
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-msggateway/Dockerfile b/build/docker/openim-msggateway/Dockerfile
index d6540921c..5661d7f8b 100644
--- a/build/docker/openim-msggateway/Dockerfile
+++ b/build/docker/openim-msggateway/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN make clean
 RUN make build BINS=openim-msggateway
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-msgtransfer/Dockerfile b/build/docker/openim-msgtransfer/Dockerfile
index 5702ce286..2c63a3716 100644
--- a/build/docker/openim-msgtransfer/Dockerfile
+++ b/build/docker/openim-msgtransfer/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN make clean
 RUN make build BINS=openim-msgtransfer
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 ENV OS ${OS}
 ENV ARCH ${ARCH}
diff --git a/build/docker/openim-push/Dockerfile b/build/docker/openim-push/Dockerfile
index ab5c7bfab..1da84525e 100644
--- a/build/docker/openim-push/Dockerfile
+++ b/build/docker/openim-push/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN make clean
 RUN make build BINS=openim-push
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-auth/Dockerfile b/build/docker/openim-rpc-auth/Dockerfile
index 96fbc9449..d7eddad5e 100644
--- a/build/docker/openim-rpc-auth/Dockerfile
+++ b/build/docker/openim-rpc-auth/Dockerfile
@@ -23,7 +23,7 @@ RUN make clean
 
 RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth ./cmd/openim-rpc/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-conversation/Dockerfile b/build/docker/openim-rpc-conversation/Dockerfile
index 551253ec9..59eaaf179 100644
--- a/build/docker/openim-rpc-conversation/Dockerfile
+++ b/build/docker/openim-rpc-conversation/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-fr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-friend/Dockerfile b/build/docker/openim-rpc-friend/Dockerfile
index 588f51b62..139ed49cb 100644
--- a/build/docker/openim-rpc-friend/Dockerfile
+++ b/build/docker/openim-rpc-friend/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-gr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-group/Dockerfile b/build/docker/openim-rpc-group/Dockerfile
index 171a6f15f..9f18a083a 100644
--- a/build/docker/openim-rpc-group/Dockerfile
+++ b/build/docker/openim-rpc-group/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-fr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-msg/Dockerfile b/build/docker/openim-rpc-msg/Dockerfile
index d27786877..48af35c1f 100644
--- a/build/docker/openim-rpc-msg/Dockerfile
+++ b/build/docker/openim-rpc-msg/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-fr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-third/Dockerfile b/build/docker/openim-rpc-third/Dockerfile
index cbc7447ba..5c4a17668 100644
--- a/build/docker/openim-rpc-third/Dockerfile
+++ b/build/docker/openim-rpc-third/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-fr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/build/docker/openim-rpc-user/Dockerfile b/build/docker/openim-rpc-user/Dockerfile
index 97c7c31b2..732368f89 100644
--- a/build/docker/openim-rpc-user/Dockerfile
+++ b/build/docker/openim-rpc-user/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-fr
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
     rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
 
-FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
+FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
 WORKDIR /openim/openim-server
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1953e9965..74eafd66c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -103,9 +103,9 @@ services:
     image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main
     container_name: openim-server
     volumes:
-      - ./_output/openim/openim-server/logs:/openim/openim-server/logs
-      - ./_output/openim/openim-server/config:/openim/openim-server/config
-      - ./_output/openim/openim-server/scripts:/openim/openim-server/scripts
+      - ./logs:/openim/openim-server/logs
+      - ./config:/openim/openim-server/config
+      - ./scripts:/openim/openim-server/scripts
     restart: always
     depends_on:
       - zookeeper
diff --git a/pkg/common/config/version b/pkg/common/config/version
index 1c5ae5820..3a285c2be 100644
--- a/pkg/common/config/version
+++ b/pkg/common/config/version
@@ -1 +1 @@
-v3.0.0
\ No newline at end of file
+v3.1.0
\ No newline at end of file