fix: CI

.github/workflows/api-tests.yml

@@ -98,7 +98,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          cp docker/.env.example docker/.env
+          ./docker/init-env.sh
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/main-ci.yml

@@ -56,7 +56,9 @@ jobs:
               - 'api/**'
               - '.github/workflows/api-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
+              - 'docker/.env.all'
               - 'docker/.env.example'
+              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/docker-compose-template.yaml'
@@ -93,7 +95,9 @@ jobs:
               - 'api/providers/vdb/*/tests/**'
               - '.github/workflows/vdb-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
+              - 'docker/.env.all'
               - 'docker/.env.example'
+              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.yaml'
               - 'docker/docker-compose-template.yaml'

.github/workflows/vdb-tests-full.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          cp docker/.env.example docker/.env
+          ./docker/init-env.sh
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/vdb-tests.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          cp docker/.env.example docker/.env
+          ./docker/init-env.sh
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

dev/pytest/pytest_config_tests.py

@@ -92,7 +92,7 @@ BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF: frozenset[str] = frozenset(
 )
 
 API_CONFIG_SET = set(dotenv_values(Path("api") / Path(".env.example")).keys())
-DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.example")).keys())
+DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.all")).keys())
 DOCKER_COMPOSE_CONFIG_SET = set()
 
 with open(Path("docker") / Path("docker-compose.yaml")) as f:
@@ -101,15 +101,23 @@ with open(Path("docker") / Path("docker-compose.yaml")) as f:
 
 def test_yaml_config():
     # python set == operator is used to compare two sets
-    DIFF_API_WITH_DOCKER = API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
+    DIFF_API_WITH_DOCKER = (
+        API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
+    )
     if DIFF_API_WITH_DOCKER:
-        print(f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}")
+        print(
+            f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}"
+        )
         raise Exception("API and Docker config sets are different")
     DIFF_API_WITH_DOCKER_COMPOSE = (
-        API_CONFIG_SET - DOCKER_COMPOSE_CONFIG_SET - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
+        API_CONFIG_SET
+        - DOCKER_COMPOSE_CONFIG_SET
+        - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
     )
     if DIFF_API_WITH_DOCKER_COMPOSE:
-        print(f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}")
+        print(
+            f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}"
+        )
         raise Exception("API and Docker Compose config sets are different")
     print("All tests passed!")
 

dev/pytest/pytest_full.sh

@@ -14,7 +14,7 @@ export OPENDAL_FS_ROOT=${OPENDAL_FS_ROOT:-/tmp/dify-storage}
 mkdir -p "${OPENDAL_FS_ROOT}"
 
 # Prepare env files like CI
-cp -n docker/.env.example docker/.env || true
+./docker/init-env.sh
 cp -n docker/middleware.env.example docker/middleware.env || true
 cp -n api/tests/integration_tests/.env.example api/tests/integration_tests/.env || true