Update Dockerfile and run script for improved configuration handling

- Added installation of iproute2 and libsasl2-2 in the Dockerfile.
- Updated the run script to streamline configuration sourcing and modified the path for the collector configuration file.
- Changed the installation command to use the new install script location.

Author: robin-rpr

Dockerfile

@@ -12,15 +12,18 @@ RUN rm -rf build && mkdir -p build && cd build \
 
 FROM debian:stable-slim
 
-COPY --chmod=755 scripts/run.sh /usr/sbin/run
+RUN apt-get update && apt-get install -y iproute2 libsasl2-2
+RUN rm -rf /var/lib/apt/lists/*
 
 ARG VERSION=0
 
+COPY --chmod=755 --from=build /ws/scripts/run.sh /usr/sbin/run
+COPY --chmod=755 --from=build /ws/scripts/install.sh /usr/sbin/install
 COPY --chmod=755 --from=build /usr/bin/collectord /usr/bin/
 COPY --from=build /usr/etc/bgpdata/collectord.conf /usr/etc/bgpdata/collectord.conf
 
 # Install
-RUN scripts/install.sh
+RUN /usr/sbin/install
 
 VOLUME ["/config"]
 

scripts/run.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-# All-in-One run script
-#
-# Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.  All rights reserved.
-#
-# Author: Tim Evens <tim@openbmp.org>
-#
+# Copyright (c) 2021 Cisco Systems, Inc. and Tim Evens.
+# All rights reserved.
+
 ADMIN_ID=${ADMIN_ID:="collector"}
 
 DOCKER_HOST_IP=$(ip route | grep default | head -1 | awk '{ print $3}')
@@ -24,13 +21,6 @@ else
     fi
 fi
 
-
-if [[ -f /config/collectord ]]; then
-    source /config/collectord
-else
-    source /etc/default/collectord
-fi
-
 #
 # System info
 #
@@ -52,13 +42,9 @@ fi
 
 
 # Update collectord config file
-COLLECTOR_CFG_FILE=/usr/etc/openbmp/collectord.conf
-sed -r -i "s/admin_id:.*/admin_id: ${ADMIN_ID}/" /usr/etc/openbmp/collectord.conf
-sed -r -i "s/localhost:9092/${KAFKA_FQDN}/" /usr/etc/openbmp/collectord.conf
-
-if [[ -f /config/collectord.conf ]]; then
-    COLLECTOR_CFG_FILE=/config/collectord.conf
-fi
+COLLECTOR_CFG_FILE=/usr/etc/bgpdata/collectord.conf
+sed -r -i "s/admin_id:.*/admin_id: ${ADMIN_ID}/" /usr/etc/bgpdata/collectord.conf
+sed -r -i "s/localhost:9092/${KAFKA_FQDN}/" /usr/etc/bgpdata/collectord.conf
 
 # Startup delay to allow for Kafka to start if not already running
 echo "Waiting 30 seconds to allow for Kafka and other containers to startup."