修改部署文件
This commit is contained in:
@@ -36,6 +36,7 @@ FROM debian:bookworm-slim
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
gettext-base \
|
||||
tzdata \
|
||||
netcat-openbsd \
|
||||
libreadline8 \
|
||||
libncurses6 \
|
||||
@@ -46,6 +47,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
COPY --from=builder /usr/sbin/bird /usr/sbin/bird
|
||||
COPY --from=builder /usr/sbin/birdc /usr/sbin/birdc
|
||||
COPY --from=builder /etc/bird /etc/bird
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
RUN chmod +x /entrypoint.sh \
|
||||
|
||||
@@ -2,9 +2,16 @@ services:
|
||||
bird-rpki-client:
|
||||
environment:
|
||||
BIRD_CONFIG_TEMPLATE_PATH: "/config/bird.conf.ssh.template"
|
||||
RPKI_HOST: "0.0.0.0"
|
||||
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
|
||||
networks:
|
||||
- rpki_net
|
||||
|
||||
networks:
|
||||
rpki_net:
|
||||
name: rpki_net
|
||||
driver: bridge
|
||||
|
||||
@@ -7,11 +7,10 @@ services:
|
||||
BIRD_VERSION: "3.2.1"
|
||||
container_name: bird-rpki-client
|
||||
restart: unless-stopped
|
||||
network_mode: host
|
||||
environment:
|
||||
BIRD_CONFIG_TEMPLATE_PATH: "/config/bird.conf.template"
|
||||
|
||||
RPKI_HOST: "0.0.0.0"
|
||||
RPKI_HOST: "rpki-rtr-tcp"
|
||||
RPKI_PORT: "323"
|
||||
|
||||
OBSERVE_PROTO: "rpki_tcp"
|
||||
@@ -33,3 +32,10 @@ services:
|
||||
volumes:
|
||||
- ./bird.conf.template:/config/bird.conf.template:ro
|
||||
- ../../logs/bird:/app/logs
|
||||
networks:
|
||||
- rpki_net
|
||||
|
||||
networks:
|
||||
rpki_net:
|
||||
name: rpki_net
|
||||
driver: bridge
|
||||
|
||||
@@ -120,7 +120,7 @@ print_first_n_objects() {
|
||||
}
|
||||
|
||||
print_snapshot() {
|
||||
echo "==== $(date -u +"%Y-%m-%dT%H:%M:%SZ") RPKI snapshot ($PROTO) ===="
|
||||
echo "==== $(date +"%Y-%m-%dT%H:%M:%S%:z") RPKI snapshot ($PROTO) ===="
|
||||
birdc -s "$SOCK_PATH" show protocols all "$PROTO" || true
|
||||
|
||||
if [ "$SHOW_ASPA" = "1" ]; then
|
||||
|
||||
Reference in New Issue
Block a user