start nebula server on workflow

vesoft-inc · Nov 4, 2021 · 0bae30b · 0bae30b
1 parent 1b99039
commit 0bae30b
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 35 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -41,6 +41,33 @@ jobs:
         cp ../../client/src/test/resources/docker-compose.yaml .
         docker-compose up -d
         sleep 10
+        docker-compose ps
+        popd
+        popd
+
+    - name: Install nebula-graph with CA SSL
+      run: |
+        pushd tmp
+        mkdir ca
+        pushd ca
+        cp -r ../../client/src/test/resources/ssl .
+        cp ../../client/src/test/resources/docker-compose-casigned.yaml .
+        docker-compose -f docker-compose-casigned.yaml up -d
+        sleep 30
+        docker-compose -f docker-compose-casigned.yaml ps
+        popd
+        popd
+
+    - name: Install nebula-graph with Self SSL
+      run: |
+        pushd tmp
+        mkdir self
+        pushd self
+        cp -r ../../client/src/test/resources/ssl .
+        cp ../../client/src/test/resources/docker-compose-selfsigned.yaml .
+        docker-compose -f docker-compose-selfsigned.yaml up -d
+        sleep 30
+        docker-compose -f docker-compose-selfsigned.yaml ps
         popd
         popd
 

diff --git a/client/src/test/resources/docker-compose-casigned.yaml b/client/src/test/resources/docker-compose-casigned.yaml
@@ -6,10 +6,10 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
+      - --meta_server_addrs=172.29.1.1:9559
       - --local_ip=172.29.1.1
       - --ws_ip=172.29.1.1
-      - --port=8559
+      - --port=9559
       - --data_path=/data/meta
       - --log_dir=/logs
       - --v=0
@@ -19,7 +19,7 @@ services:
       - --ws_h2_port=11000
       - --cert_path=/share/resources/test.derive.crt
       - --key_path=/share/resources/test.derive.key
-      - --password_path=/share/resources/test.ca.password
+      - --ca_path=/share/resources/test.ca.pem
       - --enable_ssl=true
     healthcheck:
       test: ["CMD", "curl", "-f", "http://172.29.1.1:11000/status"]
@@ -28,7 +28,7 @@ services:
       retries: 3
       start_period: 20s
     ports:
-      - "8559:8559"
+      - "8559:9559"
       - 11000
       - 11002
     volumes:
@@ -48,10 +48,10 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
+      - --meta_server_addrs=172.29.1.1:9559
       - --local_ip=172.29.2.1
       - --ws_ip=172.29.2.1
-      - --port=8779
+      - --port=9779
       - --data_path=/data/storage
       - --log_dir=/logs
       - --v=0
@@ -61,7 +61,7 @@ services:
       - --ws_h2_port=12000
       - --cert_path=/share/resources/test.derive.crt
       - --key_path=/share/resources/test.derive.key
-      - --password_path=/share/resources/test.ca.password
+      - --ca_path=/share/resources/test.ca.pem
       - --enable_ssl=true
     depends_on:
       - metad-casigned
@@ -72,7 +72,7 @@ services:
       retries: 3
       start_period: 20s
     ports:
-      - "8779:8779"
+      - "8779:9779"
       - 12000
       - 12002
     volumes:
@@ -92,8 +92,9 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
-      - --port=8669
+      - --meta_server_addrs=172.29.1.1:9559
+      - --port=9669
+      - --local_ip=172.29.3.1
       - --ws_ip=172.29.3.1
       - --log_dir=/logs
       - --v=0
@@ -103,7 +104,7 @@ services:
       - --ws_h2_port=13000
       - --cert_path=/share/resources/test.derive.crt
       - --key_path=/share/resources/test.derive.key
-      - --password_path=/share/resources/test.ca.password
+      - --ca_path=/share/resources/test.ca.pem
       - --enable_ssl=true
     depends_on:
       - metad-casigned
@@ -114,10 +115,11 @@ services:
       retries: 3
       start_period: 20s
     ports:
-      - "8669:8669"
+      - "8669:9669"
       - 13000
       - 13002
     volumes:
+      - ./data/graph:/data/graph:Z
       - ./logs/graph:/logs:Z
       - ./ssl:/share/resources:Z
     networks:

diff --git a/client/src/test/resources/docker-compose-selfsigned.yaml b/client/src/test/resources/docker-compose-selfsigned.yaml
@@ -6,10 +6,10 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
-      - --local_ip=172.29.1.1
-      - --ws_ip=172.29.1.1
-      - --port=8559
+      - --meta_server_addrs=172.30.1.1:9559
+      - --local_ip=172.30.1.1
+      - --ws_ip=172.30.1.1
+      - --port=9559
       - --data_path=/data/meta
       - --log_dir=/logs
       - --v=0
@@ -22,22 +22,22 @@ services:
       - --password_path=/share/resources/test.ca.password
       - --enable_ssl=true
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://172.29.1.1:11000/status"]
+      test: ["CMD", "curl", "-f", "http://172.30.1.1:11000/status"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 20s
     ports:
-      - "8559:8559"
+      - "7559:9559"
       - 11000
       - 11002
     volumes:
-      - ./data/meta:/data/meta:Z
+      - ./data/meta_self:/data/meta:Z
       - ./logs/meta:/logs:Z
       - ./ssl:/share/resources:Z
     networks:
       nebula-net-selfsigned:
-        ipv4_address: 172.29.1.1
+        ipv4_address: 172.30.1.1
     restart: on-failure
     cap_add:
       - SYS_PTRACE
@@ -48,10 +48,10 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
-      - --local_ip=172.29.2.1
-      - --ws_ip=172.29.2.1
-      - --port=8779
+      - --meta_server_addrs=172.30.1.1:9559
+      - --local_ip=172.30.2.1
+      - --ws_ip=172.30.2.1
+      - --port=9779
       - --data_path=/data/storage
       - --log_dir=/logs
       - --v=0
@@ -66,22 +66,22 @@ services:
     depends_on:
       - metad-selfsigned
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://172.29.2.1:12000/status"]
+      test: ["CMD", "curl", "-f", "http://172.30.2.1:12000/status"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 20s
     ports:
-      - "8779:8779"
+      - "7779:9779"
       - 12000
       - 12002
     volumes:
-      - ./data/storage:/data/storage:Z
+      - ./data/storage_self:/data/storage:Z
       - ./logs/storage:/logs:Z
       - ./ssl:/share/resources:Z
     networks:
       nebula-net-selfsigned:
-        ipv4_address: 172.29.2.1
+        ipv4_address: 172.30.2.1
     restart: on-failure
     cap_add:
       - SYS_PTRACE
@@ -92,9 +92,9 @@ services:
       USER: root
       TZ:   "${TZ}"
     command:
-      - --meta_server_addrs=172.29.1.1:8559
-      - --port=8669
-      - --ws_ip=172.29.3.1
+      - --meta_server_addrs=172.30.1.1:9559
+      - --port=9669
+      - --ws_ip=172.30.3.1
       - --log_dir=/logs
       - --v=0
       - --minloglevel=0
@@ -108,21 +108,22 @@ services:
     depends_on:
       - metad-selfsigned
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://172.29.3.1:13000/status"]
+      test: ["CMD", "curl", "-f", "http://172.30.3.1:13000/status"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 20s
     ports:
-      - "8669:8669"
+      - "7669:9669"
       - 13000
       - 13002
     volumes:
+      - ./data/graph_self:/data/graph:Z
       - ./logs/graph:/logs:Z
       - ./ssl:/share/resources:Z
     networks:
       nebula-net-selfsigned:
-        ipv4_address: 172.29.3.1
+        ipv4_address: 172.30.3.1
     restart: on-failure
     cap_add:
       - SYS_PTRACE
@@ -132,4 +133,4 @@ networks:
     ipam:
       driver: default
       config:
-        - subnet: 172.29.0.0/16
+        - subnet: 172.30.0.0/16