ci/e2e: move docker files of e2e to test/e2e to make code tree more c…

…lean (#103) Signed-off-by: wangbaiping <wbphub@live.com> Signed-off-by: wangbaiping <wbphub@live.com>
SkyAPM · Sep 1, 2022 · 8098ff5 · 8098ff5
1 parent 9c8c738
commit 8098ff5
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Prepare service container
         run: |
-          docker-compose -f docker-compose.e2e.yml up -d
+          docker-compose -f test/e2e/docker/docker-compose.e2e.yml up -d
       - name: Run e2e
         run: |
           pip3 install --upgrade pip
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Prepare service container
         run: |
-          docker-compose -f docker-compose.e2e-python.yml up -d
+          docker-compose -f test/e2e/docker/docker-compose.e2e-python.yml up -d
       - name: Run e2e
         run: |
           pip3 install --upgrade pip

diff --git a/e2e-docker/Dockerfile.consumer → test/e2e/docker/Dockerfile.consumer b/e2e-docker/Dockerfile.consumer → test/e2e/docker/Dockerfile.consumer
diff --git a/e2e-docker/Dockerfile.interm → test/e2e/docker/Dockerfile.interm b/e2e-docker/Dockerfile.interm → test/e2e/docker/Dockerfile.interm
diff --git a/e2e-docker/Dockerfile.provider → test/e2e/docker/Dockerfile.provider b/e2e-docker/Dockerfile.provider → test/e2e/docker/Dockerfile.provider
diff --git a/e2e-docker/Dockerfile.tool → test/e2e/docker/Dockerfile.tool b/e2e-docker/Dockerfile.tool → test/e2e/docker/Dockerfile.tool
diff --git a/docker-compose.dev.yml → test/e2e/docker/docker-compose.dev.yml b/docker-compose.dev.yml → test/e2e/docker/docker-compose.dev.yml
diff --git a/docker-compose.e2e-python.yml → .../e2e/docker/docker-compose.e2e-python.yml b/docker-compose.e2e-python.yml → .../e2e/docker/docker-compose.e2e-python.yml
@@ -2,26 +2,26 @@ version: "3.7"
 services:
   collector:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.tool
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.tool
     ports:
       - 19876:19876
       - 12800:12800
 
   consumer:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.consumer
-    ports: 
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.consumer
+    ports:
       - 8080:8080
     command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_consumer"
     depends_on:
       - collector
 
   interm:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.interm
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.interm
     ports:
       - 8082:8082
     command: python3 test/e2e/data/interm.py
@@ -31,8 +31,8 @@ services:
 
   provider:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.provider
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.provider
     ports:
       - 8081:8081
     command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_provider"

diff --git a/docker-compose.e2e.yml → test/e2e/docker/docker-compose.e2e.yml b/docker-compose.e2e.yml → test/e2e/docker/docker-compose.e2e.yml
@@ -2,26 +2,26 @@ version: "3.7"
 services:
   collector:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.tool
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.tool
     ports:
       - 19876:19876
       - 12800:12800
 
   consumer:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.consumer
-    expose: 
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.consumer
+    expose:
       - 8080
     command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_consumer"
     depends_on:
       - collector
 
   provider:
     build:
-      context: .
-      dockerfile: ./e2e-docker/Dockerfile.provider
+      context: ../../..
+      dockerfile: ./test/e2e/docker/Dockerfile.provider
     ports:
       - 8081:8081
     command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_provider"