sam/obmp-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to psql-app, version 2.0.2

Browse Source
This commit is contained in:
Tim Evens 2022-01-31 11:05:58 -08:00
parent c3839aa8fb
commit a0e6a5bc6f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collector/Dockerfile
View File

@ -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 -
#
# -----------------------------------------------

2
collector/scripts/run
View File

@ -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}

6
docker-compose.yml
View File

@ -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

4
postgres/Dockerfile
View File

@ -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

4
psql-app/Dockerfile
View File

@ -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

4
psql-app/scripts/run
View File

@ -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