diff --git a/collector/Dockerfile b/collector/Dockerfile index 13a8fd9..dd958bd 100644 --- a/collector/Dockerfile +++ b/collector/Dockerfile @@ -15,8 +15,8 @@ # # Example docker build: # tar -cL -C ../../ ./obmp-collector ./obmp-docker/collector \ -# | docker build --build-arg VERSION=2.0.1 \ -# -f obmp-docker/collector/Dockerfile -t openbmp/collector:2.0.1 - +# | docker build --build-arg VERSION=2.0.2 \ +# -f obmp-docker/collector/Dockerfile -t openbmp/collector:2.0.2 - # # ----------------------------------------------- diff --git a/collector/scripts/run b/collector/scripts/run index 5cd5b3c..8e667d8 100755 --- a/collector/scripts/run +++ b/collector/scripts/run @@ -61,5 +61,5 @@ if [[ -f /config/openbmpd.conf ]]; then fi # Start openbmpd and wait - openbmpd runs in foreground -echo "Running openbmpd collector, see /var/log/openbmpd.log" +echo "Running openbmpd collector, see /var/log/openbmpd.log " /usr/bin/openbmpd -f -l /var/log/openbmpd.log -c ${OPENBMP_CFG_FILE} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1a5ede4..4d7f77e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,7 +63,7 @@ services: psql: restart: unless-stopped container_name: obmp-psql - image: openbmp/postgres:2.0.1 + image: openbmp/postgres:2.0.2 ports: - 5432:5432 volumes: @@ -78,7 +78,7 @@ services: collector: restart: unless-stopped container_name: obmp-collector - image: openbmp/collector:2.0.1 + image: openbmp/collector:2.0.2 sysctls: - net.ipv4.tcp_keepalive_intvl=30 - net.ipv4.tcp_keepalive_probes=5 @@ -93,7 +93,7 @@ services: psql-app: restart: unless-stopped container_name: obmp-psql-app - image: openbmp/psql-app:2.0.1 + image: openbmp/psql-app:2.0.2 sysctls: - net.ipv4.tcp_keepalive_intvl=30 - net.ipv4.tcp_keepalive_probes=5 diff --git a/postgres/Dockerfile b/postgres/Dockerfile index 6d190ca..a0d5a0f 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -3,14 +3,14 @@ # Copyright (c) 2021-2022 Cisco Systems, Inc. and Tim Evens. All rights reserved. # # Build: -# docker build -t openbmp/postgres:2.0.1 . +# docker build -t openbmp/postgres:2.0.2 . # # Run: # docker run --rm -it -p 5432:5432 \ # -e POSTGRES_PASSWORD=openbmp \ # -e POSTGRES_USER=openbmp \ # -e POSTGRES_DB=openbmp \ -# openbmp/postgres:2.0.1 +# openbmp/postgres:2.0.2 FROM timescale/timescaledb:2.5.1-pg14 diff --git a/psql-app/Dockerfile b/psql-app/Dockerfile index a8018ef..fb555d9 100644 --- a/psql-app/Dockerfile +++ b/psql-app/Dockerfile @@ -13,8 +13,8 @@ # # Example docker build: # tar -cL -C ../../ ./obmp-psql ./obmp-docker/psql-app ./obmp-java-api-message \ -# | docker build --build-arg VERSION=2.0.1 \ -# -f obmp-docker/psql-app/Dockerfile -t openbmp/psql-app:2.0.1 - +# | docker build --build-arg VERSION=2.0.2 \ +# -f obmp-docker/psql-app/Dockerfile -t openbmp/psql-app:2.0.2 - # ----------------------------------------------- # stage: Build diff --git a/psql-app/scripts/run b/psql-app/scripts/run index a175050..c86f6e1 100755 --- a/psql-app/scripts/run +++ b/psql-app/scripts/run @@ -12,8 +12,8 @@ export POSTGRES_PASSWORD=${POSTGRES_PASSWORD:="openbmp"} export POSTGRES_HOST=${POSTGRES_HOST:="127.0.0.1"} export POSTGRES_PORT=${POSTGRES_PORT:="5432"} export POSTGRES_DB=${POSTGRES_DB:="openbmp"} -export POSTGRES_SSL_ENABLE=${POSTGRES_SSL_ENABLE:="port"} -export POSTGRES_SSL_MODE=${POSTGRES_SSL_MODE:="required"} +export POSTGRES_SSL_ENABLE=${POSTGRES_SSL_ENABLE:="true"} +export POSTGRES_SSL_MODE=${POSTGRES_SSL_MODE:="require"} export MEM=${MEM:="1"} # mem in gigabytes export PGCONNECT_TIMEOUT=15