From fc64f26e9b66aee4ccb5dac0fa3c48ea32238193 Mon Sep 17 00:00:00 2001 From: Carlos Brandt <carloshenriquebrandt@gmail.com> Date: Thu, 20 Sep 2018 16:07:01 +0200 Subject: [PATCH] Small adjustments (syntax basically) --- dockerfile/Dockerfile | 3 ++- dockerfile/bin/dachs.sh | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile index fc82789..d5b25bd 100644 --- a/dockerfile/Dockerfile +++ b/dockerfile/Dockerfile @@ -17,7 +17,8 @@ RUN DEBIAN_FRONTEND='noninteractive' && \ ENV LANG C.UTF-8 RUN echo LANG="$LANG" > /etc/default/locale -RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian release main' > /etc/apt/sources.list.d/gavo.list && \ +RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian release main' \ + > /etc/apt/sources.list.d/gavo.list && \ wget -qO - http://docs.g-vo.org/archive-key.asc | apt-key add - RUN DEBIAN_FRONTEND='noninteractive' && \ diff --git a/dockerfile/bin/dachs.sh b/dockerfile/bin/dachs.sh index 082b6b8..1096dc0 100755 --- a/dockerfile/bin/dachs.sh +++ b/dockerfile/bin/dachs.sh @@ -13,9 +13,9 @@ echo 'pointing to this container here.' echo '===================================================' echo '' -export PGDATA=/var/lib/postgresql/9.6 +export PGDATA=/var/lib/postgresql/${PG_VERSION} # postgres needs this directory for log files; then start postgres -mkdir -p -m 777 /var/run/postgresql/9.6-main.pg_stat_tmp/ -su - postgres -c "/usr/lib/postgresql/9.6/bin/postgres \ - -c config_file=/etc/postgresql/9.6/main/postgresql.conf \ +mkdir -p -m 777 /var/run/postgresql/${PG_VERSION}-main.pg_stat_tmp/ +su - postgres -c "/usr/lib/postgresql/${PG_VERSION}/bin/postgres \ + -c config_file=/etc/postgresql/${PG_VERSION}/main/postgresql.conf \ -c logging_collector=on" -- GitLab