diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile index 7eeb96c8013ba59bfd636e219404331a0f3bb627..5cedf5b9e23daa8360c79ccd47f93bb38d2542c5 100644 --- a/dockerfile/Dockerfile +++ b/dockerfile/Dockerfile @@ -15,18 +15,19 @@ 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' && \ - apt-get update && \ - apt-get install -y python-gavodachs postgresql-9.6-q3c && \ +RUN DEBIAN_FRONTEND='noninteractive' && \ + apt-get update && \ + apt-get install -y python-gavodachs postgresql-9.6-q3c && \ apt-get clean ENV GAVO_ROOT="/var/gavo" \ GAVOSETTINGS="${GAVO_ROOT}/etc/gavo.rc" \ PGHOST="postgres" - + RUN addgroup --system gavo && \ adduser --system --ingroup gavo gavo && \ adduser --disabled-password --gecos "" --ingroup gavo dachsroot && \ diff --git a/dockerfile/bin/dachs.sh b/dockerfile/bin/dachs.sh index 786e414faf70159b45a40c8f91f910e01512e087..3f563d15f64b8acf39c8d55d759e838eee6e9863 100755 --- a/dockerfile/bin/dachs.sh +++ b/dockerfile/bin/dachs.sh @@ -26,7 +26,6 @@ do done echo - su dachsroot -c "gavo init -d 'host=postgres dbname=gavo'" gavo serve start