Adjust defaults in compose and fix postgres mem setting

This commit is contained in:
Tim Evens 2021-03-30 22:31:06 -07:00
parent 74154229ad
commit c61f766cc3
2 changed files with 5 additions and 5 deletions

View File

@ -70,7 +70,7 @@ services:
- ${OBMP_DATA_ROOT}/postgres/data:/var/lib/postgresql/data # change this to 80GB SSD slice/partition - ${OBMP_DATA_ROOT}/postgres/data:/var/lib/postgresql/data # change this to 80GB SSD slice/partition
- ${OBMP_DATA_ROOT}/postgres/ts:/var/lib/postgresql/ts # Chnage this to 500GB SSD slice/partition - ${OBMP_DATA_ROOT}/postgres/ts:/var/lib/postgresql/ts # Chnage this to 500GB SSD slice/partition
environment: environment:
- MEM=2 # Set MEM to at least 2GB but ideally >16GB - MEM=10 # Set MEM to at least 2GB but ideally >16GB
- POSTGRES_PASSWORD=openbmp - POSTGRES_PASSWORD=openbmp
- POSTGRES_USER=openbmp - POSTGRES_USER=openbmp
- POSTGRES_DB=openbmp - POSTGRES_DB=openbmp
@ -104,10 +104,10 @@ services:
volumes: volumes:
- ${OBMP_DATA_ROOT}/config:/config - ${OBMP_DATA_ROOT}/config:/config
environment: environment:
- MEM=2 # Set memory to at least 2GB but ideally 4GB - MEM=4 # Set memory to at least 2GB but ideally 4GB
- KAFKA_FQDN=obmp-kafka:29092 - KAFKA_FQDN=obmp-kafka:29092
- ENABLE_RPKI=0 # 1 enables, 0 disables RPKI sync - ENABLE_RPKI=1 # 1 enables, 0 disables RPKI sync
- ENABLE_IRR=0 # 1 enables, 0 disables IRR sync - ENABLE_IRR=1 # 1 enables, 0 disables IRR sync
- POSTGRES_PASSWORD=openbmp - POSTGRES_PASSWORD=openbmp
- POSTGRES_USER=openbmp - POSTGRES_USER=openbmp
- POSTGRES_DB=openbmp - POSTGRES_DB=openbmp

View File

@ -37,7 +37,7 @@ RUN apk update \
&& sed -i -e "s/^\#*ssl[ ]*=.*/ssl = on/" /usr/local/share/postgresql/postgresql.conf.sample \ && sed -i -e "s/^\#*ssl[ ]*=.*/ssl = on/" /usr/local/share/postgresql/postgresql.conf.sample \
&& sed -i -e "s/^\#*ssl_cert_file.*=.*/ssl_cert_file = \'\/psql_server.crt\'/" /usr/local/share/postgresql/postgresql.conf.sample \ && sed -i -e "s/^\#*ssl_cert_file.*=.*/ssl_cert_file = \'\/psql_server.crt\'/" /usr/local/share/postgresql/postgresql.conf.sample \
&& sed -i -e "s/^\#*ssl_key_file.*=.*/ssl_key_file = \'\/psql_server.key\'/" /usr/local/share/postgresql/postgresql.conf.sample \ && sed -i -e "s/^\#*ssl_key_file.*=.*/ssl_key_file = \'\/psql_server.key\'/" /usr/local/share/postgresql/postgresql.conf.sample \
&& sed -i -e "s/^\#*shared_buffers.*=.*/shared_buffers = ${MEM:-'1'}GB/" /usr/local/share/postgresql/postgresql.conf.sample \ && sed -i -e "s/^\#*shared_buffers.*=.*/shared_buffers = ${MEM:-1}GB/" /usr/local/share/postgresql/postgresql.conf.sample \
&& sed -i -e "s/^\#*work_mem.*=.*/work_mem = $(( (${MEM:-1} * 1024) * 5 / 100))MB/" /usr/local/share/postgresql/postgresql.conf.sample && sed -i -e "s/^\#*work_mem.*=.*/work_mem = $(( (${MEM:-1} * 1024) * 5 / 100))MB/" /usr/local/share/postgresql/postgresql.conf.sample
# Init timesries location # Init timesries location