From 5d4fd6110d15414ed84f21db8df8b49a1f044986 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Tue, 29 Aug 2023 18:03:29 +0800 Subject: [PATCH] feat: add more test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- Dockerfile | 4 +- docker-compose.yaml | 162 ------------------------------------ go.work | 2 +- test.dockerfile | 17 ---- test/typecheck/go.mod | 2 +- tools/changelog/go.mod | 2 +- tools/component/go.mod | 2 +- tools/imctl/go.mod | 2 +- tools/infra/go.mod | 2 +- tools/ncpu/go.mod | 2 +- tools/versionchecker/go.mod | 2 +- tools/yamlfmt/go.mod | 2 +- 12 files changed, 11 insertions(+), 190 deletions(-) delete mode 100644 docker-compose.yaml delete mode 100644 test.dockerfile diff --git a/Dockerfile b/Dockerfile index ff5a3763e..5bd3930e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ ENV GOPROXY=$GOPROXY # Set up the working directory WORKDIR /openim/openim-server -COPY go.mod go.sum go.work ./ -#RUN go mod download +COPY go.mod go.sum ./ +RUN go mod download # Copy all files to the container ADD . . diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 0df119260..000000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,162 +0,0 @@ -#fixme Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git -version: "3" -services: - mysql: - image: mysql:5.7 - ports: - - 13306:3306 - - 23306:33060 - container_name: mysql - volumes: - - ${DATA_DIR}/components/mysql/data:/var/lib/mysql - - /etc/localtime:/etc/localtime - environment: - MYSQL_ROOT_PASSWORD: ${PASSWORD} - restart: always - - mongodb: - image: mongo:6.0.2 - ports: - - 37017:27017 - container_name: mongo - command: --wiredTigerCacheSizeGB 1 --auth - volumes: - - ${DATA_DIR}/components/mongodb/data/db:/data/db - - ${DATA_DIR}/components/mongodb/data/logs:/data/logs - - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo - - ./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro - environment: - - TZ=Asia/Shanghai - # cache - - wiredTigerCacheSizeGB=1 - - MONGO_INITDB_ROOT_USERNAME=${USER} - - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD} - - MONGO_INITDB_DATABASE=openIM - - MONGO_USERNAME=${USER} - - MONGO_PASSWORD=${PASSWORD} - restart: always - - redis: - image: redis:7.0.0 - ports: - - 16379:6379 - container_name: redis - volumes: - - ${DATA_DIR}/components/redis/data:/data - #redis config file - - ${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf - environment: - TZ: Asia/Shanghai - restart: always - sysctls: - net.core.somaxconn: 1024 - command: redis-server --requirepass ${PASSWORD} --appendonly yes - - zookeeper: - image: wurstmeister/zookeeper - ports: - - 2181:2181 - container_name: zookeeper - volumes: - - /etc/localtime:/etc/localtime - environment: - TZ: Asia/Shanghai - restart: always - network_mode: "host" - - kafka: - image: wurstmeister/kafka - container_name: kafka - restart: always - ports: - - 9092:9092 - environment: - TZ: Asia/Shanghai - KAFKA_BROKER_ID: 0 - KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 - KAFKA_CREATE_TOPICS: "latestMsgToRedis:8:1,msgToPush:8:1,offlineMsgToMongoMysql:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 - KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" - KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE - depends_on: - - zookeeper - network_mode: "host" - - minio: - image: minio/minio - ports: - - 10005:9000 - - 9090:9090 - container_name: minio - volumes: - - ${DATA_DIR}/components/mnt/data:/data - - ${DATA_DIR}/components/mnt/config:/root/.minio - environment: - MINIO_ROOT_USER: ${USER} - MINIO_ROOT_PASSWORD: ${PASSWORD} - restart: always - command: minio server /data --console-address ':9090' - - openim-server: - image: ghcr.io/openimsdk/openim-server:main - # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main - # image: openim/openim-server:main - container_name: openim-server - ports: - - 10001:10001 - - 10002:10002 - healthcheck: - test: ["CMD-SHELL", "./scripts/check-all.sh"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - ./logs:/openim/openim-server/logs - - ./config:/openim/openim-server/config - - ./scripts:/openim/openim-server/scripts - restart: always - depends_on: - - zookeeper - - kafka - - mysql - - mongodb - - redis - - minio - network_mode: "host" - logging: - driver: json-file - options: - max-size: "1g" - max-file: "2" - - prometheus: - image: prom/prometheus - volumes: - - ./.docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml - container_name: prometheus - # ports: - # - 9091:9091 - depends_on: - - openim-server - command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml" - network_mode: "host" - - grafana: - image: grafana/grafana - volumes: - - ./.docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml - - ./.docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini - - ./.docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json - container_name: grafana - depends_on: - - prometheus - network_mode: "host" - - - # node-exporter: - # image: quay.io/prometheus/node-exporter - # container_name: node-exporter - # restart: always - # ports: - # - "9100:9100" diff --git a/go.work b/go.work index 11d64166c..a7024b994 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.20.0 +go 1.18 use ( . diff --git a/test.dockerfile b/test.dockerfile deleted file mode 100644 index 5e76827dc..000000000 --- a/test.dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# FROM ghcr.io/openim-sigs/openim-bash-image:latest -FROM ghcr.io/openim-sigs/openim-bash-image:latest - -WORKDIR /openim/openim-server - -COPY ./_output/bin/platforms /openim/openim-server/_output/bin/platforms -COPY ./config /openim/openim-server/config - -ENV PORT 10002 - -EXPOSE 10002 - -RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api - -ENTRYPOINT ["/usr/bin/openim-api","-c","${SERVER_WORKDIR}/config"] - -CMD ["--port 10002"] \ No newline at end of file diff --git a/test/typecheck/go.mod b/test/typecheck/go.mod index 5bc1000ed..253c4641e 100644 --- a/test/typecheck/go.mod +++ b/test/typecheck/go.mod @@ -1,6 +1,6 @@ module github.com/OpenIMSDK/Open-IM-Server/test/typecheck -go 1.20 +go 1.18 require golang.org/x/tools v0.12.0 diff --git a/tools/changelog/go.mod b/tools/changelog/go.mod index 319cdecec..bc3f2192d 100644 --- a/tools/changelog/go.mod +++ b/tools/changelog/go.mod @@ -1,3 +1,3 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/changelog -go 1.20 +go 1.18 diff --git a/tools/component/go.mod b/tools/component/go.mod index bc7abc133..c38541ed7 100644 --- a/tools/component/go.mod +++ b/tools/component/go.mod @@ -1,3 +1,3 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/component -go 1.19 +go 1.18 diff --git a/tools/imctl/go.mod b/tools/imctl/go.mod index de509e1ce..5b14e0168 100644 --- a/tools/imctl/go.mod +++ b/tools/imctl/go.mod @@ -1,6 +1,6 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/imctl -go 1.20 +go 1.18 require ( github.com/MakeNowJust/heredoc/v2 v2.0.1 diff --git a/tools/infra/go.mod b/tools/infra/go.mod index 66a5b837d..acac79508 100644 --- a/tools/infra/go.mod +++ b/tools/infra/go.mod @@ -1,3 +1,3 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/infra -go 1.20 +go 1.18 diff --git a/tools/ncpu/go.mod b/tools/ncpu/go.mod index c42fd4cc2..4173d306e 100644 --- a/tools/ncpu/go.mod +++ b/tools/ncpu/go.mod @@ -1,5 +1,5 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/ncpu -go 1.20 +go 1.18 require go.uber.org/automaxprocs v1.5.3 diff --git a/tools/versionchecker/go.mod b/tools/versionchecker/go.mod index 865a34dbb..1c189e604 100644 --- a/tools/versionchecker/go.mod +++ b/tools/versionchecker/go.mod @@ -1,3 +1,3 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/versionchecker -go 1.20.0 +go 1.18 diff --git a/tools/yamlfmt/go.mod b/tools/yamlfmt/go.mod index a6acf38a1..223264de8 100644 --- a/tools/yamlfmt/go.mod +++ b/tools/yamlfmt/go.mod @@ -1,6 +1,6 @@ module github.com/OpenIMSDK/Open-IM-Server/tools/yamlfmt -go 1.20 +go 1.18 require ( github.com/likexian/gokit v0.25.13