增加环境变量

deploy/bird/.env

@@ -0,0 +1,33 @@
+# Build-time image knob.
+RPKI_BIRD_VERSION=3.2.1
+
+# TCP mode target endpoint.
+RPKI_BIRD_RPKI_HOST=rpki-rtr-tcp
+RPKI_BIRD_RPKI_PORT=323
+
+# SSH mode target endpoint.
+RPKI_BIRD_SSH_RPKI_HOST=rpki-rtr
+RPKI_RTR_SSH_PORT=22
+
+# Config template paths in container.
+RPKI_BIRD_CONFIG_TEMPLATE_PATH=/config/bird.conf.template
+RPKI_BIRD_SSH_CONFIG_TEMPLATE_PATH=/config/bird.conf.ssh.template
+
+# Observation and output knobs.
+RPKI_BIRD_OBSERVE_PROTO=rpki_tcp
+RPKI_BIRD_OBSERVE_MODE=interval
+RPKI_BIRD_OBSERVE_DEBOUNCE_SECS=1
+RPKI_BIRD_OBSERVE_INTERVAL=30
+RPKI_BIRD_OBSERVE_ASPA_TABLE=rtr_aspa
+RPKI_BIRD_OBSERVE_ROA4_TABLE=rtr_roa_v4
+RPKI_BIRD_OBSERVE_ROA6_TABLE=rtr_roa_v6
+RPKI_BIRD_OBSERVE_ASPA_COUNT=3
+RPKI_BIRD_OBSERVE_ROA4_COUNT=3
+RPKI_BIRD_OBSERVE_ROA6_COUNT=3
+RPKI_BIRD_SHOW_ASPA=1
+RPKI_BIRD_SHOW_ROA4=1
+RPKI_BIRD_SHOW_ROA6=1
+
+# Host volume mounts.
+RPKI_BIRD_LOG_HOST_DIR=../../logs/bird
+RPKI_BIRD_SSH_CERTS_HOST_DIR=../../certs

deploy/bird/docker-compose.ssh.yml

@@ -1,13 +1,13 @@
 services:
   bird-rpki-client:
     environment:
-      BIRD_CONFIG_TEMPLATE_PATH: "/config/bird.conf.ssh.template"
-      RPKI_HOST: "rpki-rtr"
+      BIRD_CONFIG_TEMPLATE_PATH: "${RPKI_BIRD_SSH_CONFIG_TEMPLATE_PATH:-/config/bird.conf.ssh.template}"
+      RPKI_HOST: "${RPKI_BIRD_SSH_RPKI_HOST:-rpki-rtr}"
       RPKI_PORT: "${RPKI_RTR_SSH_PORT:-22}"
       OBSERVE_PROTO: "rpki_ssh"
     volumes:
       - ./bird.conf.ssh.template:/config/bird.conf.ssh.template:ro
-      - ../../certs:/config/ssh:ro
+      - ${RPKI_BIRD_SSH_CERTS_HOST_DIR:-../../certs}:/config/ssh:ro
     networks:
       - rpki_net
 

deploy/bird/docker-compose.yml

@@ -4,34 +4,34 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        BIRD_VERSION: "3.2.1"
+        BIRD_VERSION: "${RPKI_BIRD_VERSION:-3.2.1}"
     container_name: bird-rpki-client
     restart: unless-stopped
     environment:
-      BIRD_CONFIG_TEMPLATE_PATH: "/config/bird.conf.template"
+      BIRD_CONFIG_TEMPLATE_PATH: "${RPKI_BIRD_CONFIG_TEMPLATE_PATH:-/config/bird.conf.template}"
 
-      RPKI_HOST: "rpki-rtr-tcp"
-      RPKI_PORT: "323"
+      RPKI_HOST: "${RPKI_BIRD_RPKI_HOST:-rpki-rtr-tcp}"
+      RPKI_PORT: "${RPKI_BIRD_RPKI_PORT:-323}"
 
-      OBSERVE_PROTO: "rpki_tcp"
-      OBSERVE_MODE: "interval"
-      OBSERVE_DEBOUNCE_SECS: "1"
-      OBSERVE_INTERVAL: "30"
+      OBSERVE_PROTO: "${RPKI_BIRD_OBSERVE_PROTO:-rpki_tcp}"
+      OBSERVE_MODE: "${RPKI_BIRD_OBSERVE_MODE:-interval}"
+      OBSERVE_DEBOUNCE_SECS: "${RPKI_BIRD_OBSERVE_DEBOUNCE_SECS:-1}"
+      OBSERVE_INTERVAL: "${RPKI_BIRD_OBSERVE_INTERVAL:-30}"
 
-      OBSERVE_ASPA_TABLE: "rtr_aspa"
-      OBSERVE_ROA4_TABLE: "rtr_roa_v4"
-      OBSERVE_ROA6_TABLE: "rtr_roa_v6"
+      OBSERVE_ASPA_TABLE: "${RPKI_BIRD_OBSERVE_ASPA_TABLE:-rtr_aspa}"
+      OBSERVE_ROA4_TABLE: "${RPKI_BIRD_OBSERVE_ROA4_TABLE:-rtr_roa_v4}"
+      OBSERVE_ROA6_TABLE: "${RPKI_BIRD_OBSERVE_ROA6_TABLE:-rtr_roa_v6}"
 
-      OBSERVE_ASPA_COUNT: "3"
-      OBSERVE_ROA4_COUNT: "3"
-      OBSERVE_ROA6_COUNT: "3"
+      OBSERVE_ASPA_COUNT: "${RPKI_BIRD_OBSERVE_ASPA_COUNT:-3}"
+      OBSERVE_ROA4_COUNT: "${RPKI_BIRD_OBSERVE_ROA4_COUNT:-3}"
+      OBSERVE_ROA6_COUNT: "${RPKI_BIRD_OBSERVE_ROA6_COUNT:-3}"
 
-      SHOW_ASPA: "1"
-      SHOW_ROA4: "1"
-      SHOW_ROA6: "1"
+      SHOW_ASPA: "${RPKI_BIRD_SHOW_ASPA:-1}"
+      SHOW_ROA4: "${RPKI_BIRD_SHOW_ROA4:-1}"
+      SHOW_ROA6: "${RPKI_BIRD_SHOW_ROA6:-1}"
     volumes:
       - ./bird.conf.template:/config/bird.conf.template:ro
-      - ../../logs/bird:/app/logs
+      - ${RPKI_BIRD_LOG_HOST_DIR:-../../logs/bird}:/app/logs
     networks:
       - rpki_net