Server和client部署整理

2026-07-09 17:14:21 +08:00
parent b5cbc7fbee
commit e2bdcd3820
51 changed files with 532 additions and 344 deletions
--- a/deploy/client/.env
+++ b/deploy/client/.env
@@ -1,8 +1,10 @@
-# Target RTR server address for client compose files
+# Target RTR server addresses for client compose files
 # TCP example: 10.0.0.12:323
 # TLS example: rpki.example.com:324
 # SSH example: 10.0.0.12:22
-RPKI_RTR_SERVER_ADDR=rpki-rtr-tcp:323
+RPKI_RTR_TCP_SERVER_ADDR=rpki-rtr:323
+RPKI_RTR_TLS_SERVER_ADDR=rpki-rtr:324
+RPKI_RTR_SSH_SERVER_ADDR=rpki-rtr:22

 # RTR protocol version used as client command second argument (supported: 0,1,2)
 RPKI_RTR_PROTOCOL_VERSION=2
@@ -13,14 +15,14 @@ RPKI_RTR_TLS_SERVER_NAME=localhost
 RPKI_RTR_TLS_CA_CERT_PATH=/app/certs/client-ca.crt
 RPKI_RTR_TLS_CLIENT_CERT_PATH=/app/certs/client-good.crt
 RPKI_RTR_TLS_CLIENT_KEY_PATH=/app/certs/client-good.key
-RPKI_RTR_TLS_CERTS_HOST_DIR=../../tests/fixtures/tls
+RPKI_RTR_TLS_CERTS_HOST_DIR=../../certs/tls

 # Shared client logs mount on host.
 RPKI_RTR_CLIENT_LOG_HOST_DIR=../../logs/client

 # SSH mode examples:
-# RPKI_RTR_SERVER_ADDR=10.0.0.12:2222
-RPKI_RTR_CLIENT_KEYS_VOLUME=../../certs:/app/certs:ro
+# RPKI_RTR_SSH_SERVER_ADDR=10.0.0.12:2222
+RPKI_RTR_CLIENT_KEYS_VOLUME=../../certs/ssh:/app/certs:ro
 RPKI_RTR_CLIENT_KEY_PATH=/app/certs/rtr-client.key
 RPKI_RTR_SSH_SERVER_PUBKEY_PATH=/app/certs/ssh_host_rsa_key.pub
 RPKI_RTR_SSH_USERNAME=rpki-rtr
--- a/deploy/client/docker-compose.clients.yml
+++ b/deploy/client/docker-compose.clients.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
  rtr-client-1:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
@@ -12,7 +12,7 @@ services:

  rtr-client-2:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
@@ -21,7 +21,7 @@ services:

  rtr-client-3:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
@@ -30,7 +30,7 @@ services:

  rtr-client-4:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
@@ -39,7 +39,7 @@ services:

  rtr-client-5:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
--- a/deploy/client/docker-compose.ssh.password.yml
+++ b/deploy/client/docker-compose.ssh.password.yml
@@ -8,7 +8,7 @@ services:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
    command:
      [
-        "${RPKI_RTR_SERVER_ADDR:-rpki-rtr-ssh:22}",
+        "${RPKI_RTR_SSH_SERVER_ADDR:-rpki-rtr:22}",
        "${RPKI_RTR_PROTOCOL_VERSION:-2}",
        "reset",
        "--ssh",
@@ -22,7 +22,7 @@ services:
        "--summary-only"
      ]
    volumes:
-      - ${RPKI_RTR_CLIENT_KEYS_VOLUME:-../../certs:/app/certs:ro}
+      - ${RPKI_RTR_CLIENT_KEYS_VOLUME:-../../certs/ssh:/app/certs:ro}
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
    stdin_open: true
--- a/deploy/client/docker-compose.ssh.yml
+++ b/deploy/client/docker-compose.ssh.yml
@@ -8,7 +8,7 @@ services:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
    command:
      [
-        "${RPKI_RTR_SERVER_ADDR:-rpki-rtr-ssh:22}",
+        "${RPKI_RTR_SSH_SERVER_ADDR:-rpki-rtr:22}",
        "${RPKI_RTR_PROTOCOL_VERSION:-2}",
        "reset",
        "--ssh",
@@ -22,7 +22,7 @@ services:
        "--summary-only"
      ]
    volumes:
-      - ${RPKI_RTR_CLIENT_KEYS_VOLUME:-../../certs:/app/certs:ro}
+      - ${RPKI_RTR_CLIENT_KEYS_VOLUME:-../../certs/ssh:/app/certs:ro}
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
    stdin_open: true
--- a/deploy/client/docker-compose.tcp.yml
+++ b/deploy/client/docker-compose.tcp.yml
@@ -4,7 +4,7 @@ services:
      context: ../..
      dockerfile: deploy/client/Dockerfile
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
--- a/deploy/client/docker-compose.tls.yml
+++ b/deploy/client/docker-compose.tls.yml
@@ -8,7 +8,7 @@ services:
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
    command:
      [
-        "${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tls:324}",
+        "${RPKI_RTR_TLS_SERVER_ADDR:-rpki-rtr:324}",
        "${RPKI_RTR_PROTOCOL_VERSION:-2}",
        "reset",
        "--tls",
@@ -24,7 +24,7 @@ services:
        "--summary-only"
      ]
    volumes:
-      - ${RPKI_RTR_TLS_CERTS_HOST_DIR:-../../tests/fixtures/tls}:/app/certs:ro
+      - ${RPKI_RTR_TLS_CERTS_HOST_DIR:-../../certs/tls}:/app/certs:ro
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no
    stdin_open: true
--- a/deploy/client/docker-compose.yml
+++ b/deploy/client/docker-compose.yml
@@ -4,7 +4,7 @@ services:
      context: ../..
      dockerfile: deploy/client/Dockerfile
    image: ${RPKI_RTR_CLIENT_IMAGE:-rpki-rtr-debug-client:latest}
-    command: ["${RPKI_RTR_SERVER_ADDR:-rpki-rtr-tcp:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
+    command: ["${RPKI_RTR_TCP_SERVER_ADDR:-rpki-rtr:323}", "${RPKI_RTR_PROTOCOL_VERSION:-2}", "reset", "--keep-after-error", "--summary-only"]
    volumes:
      - ${RPKI_RTR_CLIENT_LOG_HOST_DIR:-../../logs/client}:/app/logs
    restart: no