🚀 修改 e2e 配置.

.github/workflows/e2e.yaml

@@ -19,4 +19,4 @@ jobs:
         run: |
           sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
           sudo chmod u+x /usr/local/bin/docker-compose
-          docker compose up --build testing --exit-code-from testing --remove-orphans
+          docker compose up --build testing --exit-code-from testing --remove-orphans -f docker-compose-testing.yml

docker-compose-testing.yml

@@ -0,0 +1,79 @@
+version: '3.3'
+services:
+  orion-visor-service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.9
+    privileged: true
+    ports:
+      - 1081:80
+    environment:
+      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_PORT=3306
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=Data@123456
+      - REDIS_HOST=orion-visor-redis
+      - REDIS_PASSWORD=Data@123456
+      - SECRET_KEY=uQeacXV8b3isvKLK
+      - DEMO_MODE=false
+    volumes:
+      - /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
+    healthcheck:
+      test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
+      interval: 3s
+      timeout: 300s
+      retries: 200
+      start_period: 3s
+    depends_on:
+      orion-visor-mysql:
+        condition: service_healthy
+      orion-visor-redis:
+        condition: service_healthy
+    links:
+      - orion-visor-mysql
+      - orion-visor-redis
+  orion-visor-mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.9
+    privileged: true
+    ports:
+      - 3307:3306
+    environment:
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=orion
+      - MYSQL_PASSWORD=Data@123456
+      - MYSQL_ROOT_PASSWORD=Data@123456
+    volumes:
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
+  orion-visor-redis:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.9
+    privileged: true
+    ports:
+      - 6380:6379
+    environment:
+      - REDIS_PASSWORD=Data@123456
+    volumes:
+      - /data/orion-visor-space/docker-volumes/redis/data:/data
+    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
+  testing:
+    build:
+      context: ./docker/e2e
+    environment:
+      SERVER: http://orion-visor-service:80
+    depends_on:
+      orion-visor-service:
+        condition: service_healthy
+    links:
+      - orion-visor-service

docker-compose.yml

@@ -16,9 +16,9 @@ services:
       - SECRET_KEY=uQeacXV8b3isvKLK
       - DEMO_MODE=false
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
+      - /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
     healthcheck:
-      test: ["CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health"]
+      test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
       interval: 3s
       timeout: 300s
       retries: 200
@@ -42,11 +42,11 @@ services:
       - MYSQL_PASSWORD=Data@123456
       - MYSQL_ROOT_PASSWORD=Data@123456
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
+      - /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
+      - /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
     healthcheck:
-      test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"]
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
       interval: 3s
       timeout: 60s
       retries: 10
@@ -59,7 +59,7 @@ services:
     environment:
       - REDIS_PASSWORD=Data@123456
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - /data/orion-visor-space/docker-volumes/redis/data:/data
     command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
     healthcheck:
       test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
@@ -71,13 +71,3 @@ services:
     image: adminer
     ports:
       - 8081:8080
-  testing:
-    build:
-      context: e2e
-    environment:
-      SERVER: http://orion-visor-service:80
-    depends_on:
-      orion-visor-service:
-        condition: service_healthy
-    links:
-      - orion-visor-service

docker/e2e/testsuite.yaml

@@ -0,0 +1,57 @@
+#!api-testing
+# yaml-language-server: $schema=https://linuxsuren.github.io/api-testing/api-testing-schema.json
+name: orion-visor
+api: |
+  {{default "http://orion-visor-service:80" (env "SERVER")}}
+items:
+  - name: login
+    request:
+      api: /orion-visor/api/infra/auth/login
+      method: POST
+      header:
+        Content-type: application/json
+      body: |
+        {"username":"admin","password":"21232f297a57a5a743894a0e4a801fc3"}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+  - name: userPermission
+    request:
+      api: /orion-visor/api/infra/permission/user
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: menu
+    request:
+      api: /orion-visor/api/infra/permission/menu
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: haveUnRead
+    request:
+      api: /orion-visor/api/infra/system-message/has-unread
+      header:
+        Authorization: Bearer {{.login.data.token}}
+  - name: queryOperatorLog
+    request:
+      api: /orion-visor/api/infra/mine/query-operator-log
+      method: POST
+      header:
+        Authorization: Bearer {{.login.data.token}}
+  - name: hostList
+    request:
+      api: /orion-visor/api/infra/tag/list?type=HOST
+      header:
+        Authorization: Bearer {{.login.data.token}}
+  - name: queryHost
+    request:
+      api: /orion-visor/api/asset/host/query
+      method: POST
+      header:
+        Authorization: Bearer {{.login.data.token}}

e2e/testsuite.yaml

@@ -1,54 +0,0 @@
-#!api-testing
-# yaml-language-server: $schema=https://linuxsuren.github.io/api-testing/api-testing-schema.json
-name: orion-visor
-api: |
-  {{default "http://orion-visor-service:80" (env "SERVER")}}
-items:
-- name: login
-  request:
-    api: /orion-visor/api/infra/auth/login
-    method: POST
-    header:
-      Content-type: application/json
-    body: |
-      {"username":"admin","password":"21232f297a57a5a743894a0e4a801fc3"}
-  expect:
-    bodyFieldsExpect:
-      code: 200
-- name: userPermission
-  request:
-    api: /orion-visor/api/infra/permission/user
-    header:
-      Authorization: Bearer {{.login.data.token}}
-  expect:
-    bodyFieldsExpect:
-      code: 200
-      msg: "success"
-- name: menu
-  request:
-    api: /orion-visor/api/infra/permission/menu
-    header:
-      Authorization: Bearer {{.login.data.token}}
-  expect:
-    bodyFieldsExpect:
-      code: 200
-      msg: "success"
-- name: haveUnRead
-  request:
-    api: /orion-visor/api/infra/system-message/has-unread
-    header:
-      Authorization: Bearer {{.login.data.token}}
-  expect:
-    bodyFieldsExpect:
-      data: false
-- name: queryOperatorLog
-  request:
-    api: /orion-visor/api/infra/mine/query-operator-log
-    method: POST
-- name: hostList
-  request:
-    api: /orion-visor/api/infra/tag/list?type=HOST
-- name: queryHost
-  request:
-    api: /orion-visor/api/asset/host/query
-    method: POST