瀏覽代碼

分拆增加测试环境

gemercheung 3 年之前
父節點
當前提交
9b9fbec5d8
共有 3 個文件被更改,包括 110 次插入9 次删除
  1. 7 9
      .env.test
  2. 62 0
      docker-compose.test.yml
  3. 41 0
      start_test.sh

+ 7 - 9
.env.test

@@ -1,11 +1,11 @@
 SOCKET_PORT=5000
-PORT=12000
-PORT1=12001
-PORT2=12002
+PORT=12003
+PORT1=12004
+PORT2=12005
 REDIS_MAP_PORT=6666
-CONTAINER_NAME='socket-chat-IM'
-CONTAINER_NAME1='socket-chat-IM-1'
-CONTAINER_NAME2='socket-chat-IM-2'
+CONTAINER_NAME='socket-chat-test-IM'
+CONTAINER_NAME1='socket-chat-test-IM-1'
+CONTAINER_NAME2='socket-chat-test-IM-2'
 SOCKET_PATH="/new-zfb"
 VOLUME_DIR=/home/spugData/redisData
 REDIS_HOST=172.18.159.127
@@ -15,9 +15,7 @@ REDIS_PREFIX=chat
 REDIS_DB=0
 WATCH_USER=4dage
 WATCH_PASSWORD=4dage168.
-LOGGER_PATH=/home/spugData/log0/
-LOGGER_PATH1=/home/spugData/log1/
-LOGGER_PATH2=/home/spugData/log2/
+LOGGER_PATH=/home/spugData/log/
 
 
 

+ 62 - 0
docker-compose.test.yml

@@ -0,0 +1,62 @@
+version: "3.4"
+
+services:
+  chat-socket:
+    restart: always
+    container_name: $CONTAINER_NAME
+    hostname: $CONTAINER_NAME
+    build:
+      context: .
+    ports:
+      - $PORT:$SOCKET_PORT
+    environment:
+      REDIS_HOST: $REDIS_HOST
+      REDIS_PORT: $REDIS_PORT
+      REDIS_PASSWORD: $REDIS_PASSWORD
+    volumes:
+      - ${LOGGER_PATH}:${LOGGER_PATH}
+  chat-socket1:
+    restart: always
+    container_name: $CONTAINER_NAME1
+    hostname: $CONTAINER_NAME1
+    build:
+      context: .
+    ports:
+      - $PORT1:$SOCKET_PORT
+    environment:
+      REDIS_HOST: $REDIS_HOST
+      REDIS_PORT: $REDIS_PORT
+      REDIS_PASSWORD: $REDIS_PASSWORD
+    volumes:
+      - ${LOGGER_PATH}:${LOGGER_PATH}
+  chat-socket2:
+    restart: always
+    container_name: $CONTAINER_NAME2
+    hostname: $CONTAINER_NAME2
+    build:
+      context: .
+    ports:
+      - $PORT2:$SOCKET_PORT
+    environment:
+      REDIS_HOST: $REDIS_HOST
+      REDIS_PORT: $REDIS_PORT
+      REDIS_PASSWORD: $REDIS_PASSWORD
+    volumes:
+      - ${LOGGER_PATH}:${LOGGER_PATH}
+    # depends_on:
+    #   - redis
+    # networks:
+    #   - chat-socket
+
+#   redis:
+#     image: redis:5-alpine
+#     container_name: ${CONTAINER_NAME}-redis
+#     command: redis-server --requirepass ${REDIS_PASSWORD}
+#     ports:
+#       - $REDIS_MAP_PORT:$REDIS_PORT
+#     volumes:
+#       - ${VOLUME_DIR}/redis:/data
+#     networks:
+#       - chat-socket
+# networks:
+#   chat-socket:

+ 41 - 0
start_test.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# 测试var
+cp .env.test .env
+
+source .env
+
+echo "port: $PORT"
+echo "port1: $PORT1"
+echo "port2: $PORT2"
+echo "SOCKET_PORT: $SOCKET_PORT"
+echo "CONTAINER_NAME: $CONTAINER_NAME"
+echo "CONTAINER_NAME1: $CONTAINER_NAME1"
+echo "CONTAINER_NAME2: $CONTAINER_NAME2"
+echo "SOCKET_PATH: $SOCKET_PATH"
+
+
+if [ ! "$(docker ps -q -f name=$CONTAINER_NAME))" ]; then
+    if [ "$(docker ps -aq -f status=exited -f name=$CONTAINER_NAME))" ]; then
+        # cleanup
+        echo "正在del container: $CONTAINER_NAME, $CONTAINER_NAME1, $CONTAINER_NAME2"
+        docker rm $CONTAINER_NAME -f
+        docker rm $CONTAINER_NAME1 -f
+        docker rm $CONTAINER_NAME2 -f
+        # docker rm "$CONTAINER_NAME-redis" -f
+    fi
+    # run your container
+    echo "no container and docker-compose up"
+    docker-compose -f docker-compose.test.yml up -d --build
+else
+    if [ "$(docker ps -aq -f status=running -f name=$CONTAINER_NAME))" ]; then
+        # cleanup
+        echo "正在del container: $CONTAINER_NAME, $CONTAINER_NAME1, $CONTAINER_NAME2"
+        docker rm $CONTAINER_NAME -f
+        docker rm $CONTAINER_NAME1 -f
+        docker rm $CONTAINER_NAME2 -f
+        #  docker rm "$CONTAINER_NAME-redis" -f
+    fi
+    echo "has container and docker-compose up"
+    docker-compose -f docker-compose.test.yml  up -d --build
+    
+fi