From eba244cdf707bc928caef5723174e36f35ae88a7 Mon Sep 17 00:00:00 2001 From: Tim Evens Date: Wed, 31 Mar 2021 00:13:09 -0700 Subject: [PATCH] Fix postgres to create ts. Update compose to use latest --- docker-compose.yml | 6 +++--- postgres/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 664f275..345a6f9 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:build-50 + image: openbmp/postgres:latest ports: - 5432:5432 volumes: @@ -78,7 +78,7 @@ services: collector: restart: unless-stopped container_name: obmp-collector - image: openbmp/collector:build-50 + image: openbmp/collector:latest 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:build-50 + image: openbmp/psql-app:latest sysctls: - net.ipv4.tcp_keepalive_intvl=30 - net.ipv4.tcp_keepalive_probes=5 diff --git a/postgres/Dockerfile b/postgres/Dockerfile index e09ffb8..8f4b8c5 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -41,7 +41,9 @@ RUN apk update \ && sed -i -e "s/^\#*work_mem.*=.*/work_mem = $(( (${MEM:-1} * 1024) * 5 / 100))MB/" /usr/local/share/postgresql/postgresql.conf.sample # Init timesries location -RUN echo 'psql -U $POSTGRES_USER -c "CREATE TABLESPACE timeseries LOCATION '\''/var/lib/postgresql/ts'\'';" $POSTGRES_DB' > /docker-entrypoint-initdb.d/0_obmp_init.sh +RUN echo 'chown postgres:postgres /var/lib/postgresql/ts' > /docker-entrypoint-initdb.d/0_obmp_init.sh \ + echo 'chmod 0700 /var/lib/postgresql/ts' >> /docker-entrypoint-initdb.d/0_obmp_init.sh \ + && echo 'psql -U $POSTGRES_USER -c "CREATE TABLESPACE timeseries LOCATION '\''/var/lib/postgresql/ts'\'';" $POSTGRES_DB' > /docker-entrypoint-initdb.d/0_obmp_init.sh