From 86a07996b65620a956e7876193e060b8b83cbe80 Mon Sep 17 00:00:00 2001
From: Carlos Brandt <carloshenriquebrandt@gmail.com>
Date: Thu, 20 Sep 2018 16:10:02 +0200
Subject: [PATCH] Small adjustments (syntax basically)
---
dockerfile/Dockerfile | 11 ++++++-----
dockerfile/bin/dachs.sh | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile
index 7eeb96c..5cedf5b 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 786e414..3f563d1 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
--
GitLab